comparison dwtest.c @ 2448:7e1828dd4fe0

iOS: Fix scrollbox content not expanding to take the full area if smaller. General dwtest code cleanup.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 09 Apr 2021 23:38:59 +0000
parents 8723c01fb87e
children 44b77654c406
comparison
equal deleted inserted replaced
2447:8723c01fb87e 2448:7e1828dd4fe0
164 { 164 {
165 case VK_LBUTTON : keyname = "VK_LBUTTON"; break; 165 case VK_LBUTTON : keyname = "VK_LBUTTON"; break;
166 case VK_RBUTTON : keyname = "VK_RBUTTON"; break; 166 case VK_RBUTTON : keyname = "VK_RBUTTON"; break;
167 case VK_CANCEL : keyname = "VK_CANCEL"; break; 167 case VK_CANCEL : keyname = "VK_CANCEL"; break;
168 case VK_MBUTTON : keyname = "VK_MBUTTON"; break; 168 case VK_MBUTTON : keyname = "VK_MBUTTON"; break;
169 /* case VK_BACK : keyname = "VK_BACK"; break;*/ 169 /* case VK_BACK : keyname = "VK_BACK"; break;*/
170 case VK_TAB : keyname = "VK_TAB"; break; 170 case VK_TAB : keyname = "VK_TAB"; break;
171 case VK_CLEAR : keyname = "VK_CLEAR"; break; 171 case VK_CLEAR : keyname = "VK_CLEAR"; break;
172 case VK_RETURN : keyname = "VK_RETURN"; break; 172 case VK_RETURN : keyname = "VK_RETURN"; break;
173 /* case VK_MENU : keyname = "VK_MENU"; break;*/ 173 /* case VK_MENU : keyname = "VK_MENU"; break;*/
174 case VK_PAUSE : keyname = "VK_PAUSE"; break; 174 case VK_PAUSE : keyname = "VK_PAUSE"; break;
175 case VK_CAPITAL : keyname = "VK_CAPITAL"; break; 175 case VK_CAPITAL : keyname = "VK_CAPITAL"; break;
176 case VK_ESCAPE : keyname = "VK_ESCAPE"; break; 176 case VK_ESCAPE : keyname = "VK_ESCAPE"; break;
177 case VK_SPACE : keyname = "VK_SPACE"; break; 177 case VK_SPACE : keyname = "VK_SPACE"; break;
178 case VK_PRIOR : keyname = "VK_PRIOR"; break; 178 case VK_PRIOR : keyname = "VK_PRIOR"; break;
236 case VK_SCROLL : keyname = "VK_SCROLL"; break; 236 case VK_SCROLL : keyname = "VK_SCROLL"; break;
237 case VK_LSHIFT : keyname = "VK_LSHIFT"; break; 237 case VK_LSHIFT : keyname = "VK_LSHIFT"; break;
238 case VK_RSHIFT : keyname = "VK_RSHIFT"; break; 238 case VK_RSHIFT : keyname = "VK_RSHIFT"; break;
239 case VK_LCONTROL: keyname = "VK_LCONTROL"; break; 239 case VK_LCONTROL: keyname = "VK_LCONTROL"; break;
240 case VK_RCONTROL: keyname = "VK_RCONTROL"; break; 240 case VK_RCONTROL: keyname = "VK_RCONTROL"; break;
241 /* case VK_LMENU : keyname = "VK_LMENU"; break; */ 241 /* case VK_LMENU : keyname = "VK_LMENU"; break; */
242 /* case VK_RMENU : keyname = "VK_RMENU"; break;*/ 242 /* case VK_RMENU : keyname = "VK_RMENU"; break;*/
243 default: keyname = "<unknown>"; break; 243 default: keyname = "<unknown>"; break;
244 } 244 }
245 return keyname; 245 return keyname;
246 } 246 }
247 247
248 char *resolve_keymodifiers( int mask ) 248 char *resolve_keymodifiers(int mask)
249 { 249 {
250 if((mask & KC_CTRL) && (mask & KC_SHIFT) && (mask & KC_ALT)) 250 if((mask & KC_CTRL) && (mask & KC_SHIFT) && (mask & KC_ALT))
251 return "KC_CTRL KC_SHIFT KC_ALT"; 251 return "KC_CTRL KC_SHIFT KC_ALT";
252 else if((mask & KC_CTRL) && (mask & KC_SHIFT)) 252 else if((mask & KC_CTRL) && (mask & KC_SHIFT))
253 return "KC_CTRL KC_SHIFT"; 253 return "KC_CTRL KC_SHIFT";
608 608
609 int DWSIGNAL browse_file_callback(HWND window, void *data) 609 int DWSIGNAL browse_file_callback(HWND window, void *data)
610 { 610 {
611 char *tmp; 611 char *tmp;
612 tmp = dw_file_browse("Pick a file", "dwtest.c", "c", DW_FILE_OPEN); 612 tmp = dw_file_browse("Pick a file", "dwtest.c", "c", DW_FILE_OPEN);
613 if ( tmp ) 613 if(tmp)
614 { 614 {
615 HWND notification = dw_notification_new("New file loaded", "image/test.png", "dwtest loaded \"%s\" into the file browser on the Render tab, with \"File Display\" selected from the drop down list.", tmp); 615 HWND notification = dw_notification_new("New file loaded", "image/test.png", "dwtest loaded \"%s\" into the file browser on the Render tab, with \"File Display\" selected from the drop down list.", tmp);
616 616
617 if (current_file) 617 if(current_file)
618 { 618 {
619 dw_free( current_file ); 619 dw_free(current_file);
620 } 620 }
621 current_file = tmp; 621 current_file = tmp;
622 dw_window_set_text(entryfield, current_file); 622 dw_window_set_text(entryfield, current_file);
623 read_file(); 623 read_file();
624 current_col = current_row = 0; 624 current_col = current_row = 0;
630 return 0; 630 return 0;
631 } 631 }
632 632
633 int DWSIGNAL browse_folder_callback(HWND window, void *data) 633 int DWSIGNAL browse_folder_callback(HWND window, void *data)
634 { 634 {
635 char *tmp = dw_file_browse("Pick a folder", ".", "c", DW_DIRECTORY_OPEN ); 635 char *tmp = dw_file_browse("Pick a folder", ".", "c", DW_DIRECTORY_OPEN);
636 dw_debug("Folder picked: %s\n", tmp ? tmp : "None"); 636 dw_debug("Folder picked: %s\n", tmp ? tmp : "None");
637 return 0; 637 return 0;
638 } 638 }
639 639
640 int DWSIGNAL button_callback(HWND window, void *data) 640 int DWSIGNAL button_callback(HWND window, void *data)
645 long spvalue; 645 long spvalue;
646 char buf1[100]; 646 char buf1[100];
647 char buf2[100]; 647 char buf2[100];
648 char buf3[500]; 648 char buf3[500];
649 649
650 idx = dw_listbox_selected( combobox1 ); 650 idx = dw_listbox_selected(combobox1);
651 dw_listbox_get_text( combobox1, idx, buf1, 99 ); 651 dw_listbox_get_text(combobox1, idx, buf1, 99);
652 idx = dw_listbox_selected( combobox2 ); 652 idx = dw_listbox_selected(combobox2);
653 dw_listbox_get_text( combobox2, idx, buf2, 99 ); 653 dw_listbox_get_text(combobox2, idx, buf2, 99);
654 dw_calendar_get_date( cal, &y, &m, &d ); 654 dw_calendar_get_date(cal, &y, &m, &d);
655 spvalue = dw_spinbutton_get_pos( spinbutton ); 655 spvalue = dw_spinbutton_get_pos(spinbutton);
656 len = sprintf(buf3, "spinbutton: %ld\ncombobox1: \"%s\"\ncombobox2: \"%s\"\ncalendar: %d-%d-%d", 656 len = sprintf(buf3, "spinbutton: %ld\ncombobox1: \"%s\"\ncombobox2: \"%s\"\ncalendar: %d-%d-%d",
657 spvalue, 657 spvalue,
658 buf1, buf2, 658 buf1, buf2,
659 y, m, d); 659 y, m, d);
660 dw_messagebox("Values", DW_MB_OK | DW_MB_INFORMATION, buf3 ); 660 dw_messagebox("Values", DW_MB_OK | DW_MB_INFORMATION, buf3);
661 dw_clipboard_set_text(buf3, len ); 661 dw_clipboard_set_text(buf3, len);
662 return 0; 662 return 0;
663 } 663 }
664 664
665 int DWSIGNAL bitmap_toggle_callback(HWND window, void *data) 665 int DWSIGNAL bitmap_toggle_callback(HWND window, void *data)
666 { 666 {
667 static int isfoldericon = 1; 667 static int isfoldericon = 1;
668 668
669 if ( isfoldericon ) 669 if(isfoldericon)
670 { 670 {
671 isfoldericon = 0; 671 isfoldericon = 0;
672 dw_window_set_bitmap(window, 0, FILE_ICON_NAME ); 672 dw_window_set_bitmap(window, 0, FILE_ICON_NAME);
673 dw_window_set_tooltip(window, "File Icon" ); 673 dw_window_set_tooltip(window, "File Icon");
674 } 674 }
675 else 675 else
676 { 676 {
677 isfoldericon = 1; 677 isfoldericon = 1;
678 dw_window_set_bitmap_from_data( window, 0, folder_ico, sizeof(folder_ico) ); 678 dw_window_set_bitmap_from_data(window, 0, folder_ico, sizeof(folder_ico));
679 dw_window_set_tooltip(window, "Folder Icon" ); 679 dw_window_set_tooltip(window, "Folder Icon");
680 } 680 }
681 return 0; 681 return 0;
682 } 682 }
683 683
684 int DWSIGNAL percent_button_box_callback(HWND window, void *data) 684 int DWSIGNAL percent_button_box_callback(HWND window, void *data)
706 if(data) 706 if(data)
707 { 707 {
708 HWND stext = (HWND)data; 708 HWND stext = (HWND)data;
709 char tmpbuf[100]; 709 char tmpbuf[100];
710 710
711 if ( hwnd == vscrollbar ) 711 if(hwnd == vscrollbar)
712 { 712 {
713 current_row = value; 713 current_row = value;
714 } 714 }
715 else 715 else
716 { 716 {
762 /* Redraw the render widgets */ 762 /* Redraw the render widgets */
763 render_draw(); 763 render_draw();
764 return TRUE; 764 return TRUE;
765 } 765 }
766 766
767 int DWSIGNAL item_enter_cb( HWND window, char *text, void *data, void *itemdata ) 767 int DWSIGNAL item_enter_cb(HWND window, char *text, void *data, void *itemdata)
768 { 768 {
769 char buf[200]; 769 char buf[200];
770 HWND statline = (HWND)data; 770 HWND statline = (HWND)data;
771 771
772 sprintf(buf,"DW_SIGNAL_ITEM_ENTER: Window: %x Text: %s Itemdata: %x", DW_POINTER_TO_UINT(window), text, DW_POINTER_TO_UINT(itemdata) ); 772 sprintf(buf,"DW_SIGNAL_ITEM_ENTER: Window: %x Text: %s Itemdata: %x", DW_POINTER_TO_UINT(window), text, DW_POINTER_TO_UINT(itemdata) );
773 dw_window_set_text( statline, buf); 773 dw_window_set_text( statline, buf);
774 return 0; 774 return 0;
775 } 775 }
776 776
777 int DWSIGNAL item_context_cb( HWND window, char *text, int x, int y, void *data, void *itemdata ) 777 int DWSIGNAL item_context_cb(HWND window, char *text, int x, int y, void *data, void *itemdata)
778 { 778 {
779 char buf[200]; 779 char buf[200];
780 HWND statline = (HWND)data; 780 HWND statline = (HWND)data;
781 781
782 sprintf(buf,"DW_SIGNAL_ITEM_CONTEXT: Window: %x Text: %s x: %d y: %d Itemdata: %x", DW_POINTER_TO_UINT(window), text, x, y, DW_POINTER_TO_UINT(itemdata) ); 782 sprintf(buf,"DW_SIGNAL_ITEM_CONTEXT: Window: %x Text: %s x: %d y: %d Itemdata: %x", DW_POINTER_TO_UINT(window), text, x, y, DW_POINTER_TO_UINT(itemdata) );
783 dw_window_set_text( statline, buf); 783 dw_window_set_text( statline, buf);
784 return 0; 784 return 0;
785 } 785 }
786 786
787 int DWSIGNAL list_select_cb( HWND window, int item, void *data ) 787 int DWSIGNAL list_select_cb(HWND window, int item, void *data)
788 { 788 {
789 char buf[200]; 789 char buf[200];
790 HWND statline = (HWND)data; 790 HWND statline = (HWND)data;
791 791
792 sprintf(buf,"DW_SIGNAL_LIST_SELECT: Window: %d Item: %d", DW_POINTER_TO_UINT(window), item ); 792 sprintf(buf,"DW_SIGNAL_LIST_SELECT: Window: %d Item: %d", DW_POINTER_TO_UINT(window), item );
793 dw_window_set_text( statline, buf); 793 dw_window_set_text( statline, buf);
794 return 0; 794 return 0;
795 } 795 }
796 796
797 int DWSIGNAL item_select_cb( HWND window, HTREEITEM item, char *text, void *data, void *itemdata ) 797 int DWSIGNAL item_select_cb(HWND window, HTREEITEM item, char *text, void *data, void *itemdata)
798 { 798 {
799 char buf[200]; 799 char buf[200];
800 HWND statline = (HWND)data; 800 HWND statline = (HWND)data;
801 801
802 sprintf(buf,"DW_SIGNAL_ITEM_SELECT: Window: %x Item: %x Text: %s Itemdata: %x", DW_POINTER_TO_UINT(window), 802 sprintf(buf,"DW_SIGNAL_ITEM_SELECT: Window: %x Item: %x Text: %s Itemdata: %x", DW_POINTER_TO_UINT(window),
803 DW_POINTER_TO_UINT(item), text, DW_POINTER_TO_UINT(itemdata) ); 803 DW_POINTER_TO_UINT(item), text, DW_POINTER_TO_UINT(itemdata) );
804 dw_window_set_text( statline, buf); 804 dw_window_set_text( statline, buf);
805 return 0; 805 return 0;
806 } 806 }
807 807
808 int DWSIGNAL container_select_cb( HWND window, HTREEITEM item, char *text, void *data, void *itemdata ) 808 int DWSIGNAL container_select_cb(HWND window, HTREEITEM item, char *text, void *data, void *itemdata)
809 { 809 {
810 char buf[200]; 810 char buf[200];
811 char *str; 811 char *str;
812 HWND statline = (HWND)data; 812 HWND statline = (HWND)data;
813 unsigned long size; 813 unsigned long size;
837 DW_POINTER_TO_INT(containerinfo), DW_POINTER_TO_INT(fileicon)); 837 DW_POINTER_TO_INT(containerinfo), DW_POINTER_TO_INT(fileicon));
838 dw_filesystem_change_item(container, 1, 0, &size); 838 dw_filesystem_change_item(container, 1, 0, &size);
839 return 0; 839 return 0;
840 } 840 }
841 841
842 int DWSIGNAL switch_page_cb( HWND window, unsigned long page_num, void *itemdata ) 842 int DWSIGNAL switch_page_cb(HWND window, unsigned long page_num, void *itemdata)
843 { 843 {
844 dw_debug("DW_SIGNAL_SWITCH_PAGE: Window: %x PageNum: %u Itemdata: %x\n", DW_POINTER_TO_UINT(window), 844 dw_debug("DW_SIGNAL_SWITCH_PAGE: Window: %x PageNum: %u Itemdata: %x\n", DW_POINTER_TO_UINT(window),
845 DW_POINTER_TO_UINT(page_num), DW_POINTER_TO_UINT(itemdata) ); 845 DW_POINTER_TO_UINT(page_num), DW_POINTER_TO_UINT(itemdata) );
846 return 0; 846 return 0;
847 } 847 }
848 848
849 int DWSIGNAL column_click_cb( HWND window, int column_num, void *data ) 849 int DWSIGNAL column_click_cb(HWND window, int column_num, void *data)
850 { 850 {
851 char buf[200], buf1[100]; 851 char buf[200], buf1[100];
852 HWND statline = (HWND)data; 852 HWND statline = (HWND)data;
853 int column_type; 853 int column_type;
854 854
855 if(column_num == 0) 855 if(column_num == 0)
856 strcpy(buf1,"Filename"); 856 strcpy(buf1,"Filename");
857 else 857 else
858 { 858 {
859 column_type = dw_filesystem_get_column_type( window, column_num-1 ); 859 column_type = dw_filesystem_get_column_type(window, column_num-1);
860 if( column_type == DW_CFA_STRING) 860 if( column_type == DW_CFA_STRING)
861 strcpy(buf1,"String"); 861 strcpy(buf1,"String");
862 else if( column_type == DW_CFA_ULONG) 862 else if( column_type == DW_CFA_ULONG)
863 strcpy(buf1,"ULong"); 863 strcpy(buf1,"ULong");
864 else if( column_type == DW_CFA_DATE) 864 else if( column_type == DW_CFA_DATE)