123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277 |
- === modified file 'TODO'
- --- TODO 2018-01-16 14:17:27 +0000
- +++ TODO 2019-01-27 00:36:26 +0000
- @@ -1,3 +1,6 @@
- +MAIN program
- +run each program without closing main program... so check ifndef/define for xpm icons if inheritance becomes an issue
- +
- makeWidgetIcon... extend this, or somehow check for some sort of icon or, extend to
- have a TRYthisFirst, FALLBACKname sort of condition....
-
- === modified file 'fltk/jwm-mouse.cxx'
- --- fltk/jwm-mouse.cxx 2017-01-29 14:15:16 +0000
- +++ fltk/jwm-mouse.cxx 2019-01-27 00:36:26 +0000
- @@ -21,7 +21,7 @@
- * You may redistribute this, but you must keep this comment in place
- * Jesus is my Lord, and if you don't like it feel free to ignore it.
- */
- -// generated by Fast Light User Interface Designer (fluid) version 1.0303
- +// generated by Fast Light User Interface Designer (fluid) version 1.0304
-
- #include <libintl.h>
- #include "jwm-mouse.h"
- @@ -135,9 +135,9 @@
-
- unsigned char MouseUI::menu_TouchpadOff_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_TouchpadOff[] = {
- - {"ON", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 12, 0},
- - {"Off", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 12, 0},
- - {"Tap Off", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 12, 0},
- + {"ON", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
- + {"Off", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
- + {"Tap Off", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -186,14 +186,14 @@
-
- unsigned char MouseUI::menu_TapButton1_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_TapButton1[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -206,14 +206,14 @@
-
- unsigned char MouseUI::menu_TapButton2_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_TapButton2[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -226,14 +226,14 @@
-
- unsigned char MouseUI::menu_TapButton3_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_TapButton3[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -246,14 +246,14 @@
-
- unsigned char MouseUI::menu_LTCornerButton_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_LTCornerButton[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -266,14 +266,14 @@
-
- unsigned char MouseUI::menu_RTCornerButton_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_RTCornerButton[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -286,14 +286,14 @@
-
- unsigned char MouseUI::menu_LBCornerButton_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_LBCornerButton[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -306,14 +306,14 @@
-
- unsigned char MouseUI::menu_RBCornerButton_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_RBCornerButton[] = {
- - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -403,15 +403,15 @@
-
- unsigned char MouseUI::menu_CircScrollTrigger_i18n_done = 0;
- Fl_Menu_Item MouseUI::menu_CircScrollTrigger[] = {
- - {"Everywhere", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Top", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Top Right", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Right", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Bottom Right", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Bottom", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Bottom Left", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Left", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- - {"Top Left", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- + {"Everywhere", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Top", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Top Right", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Right", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Bottom Right", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Bottom", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Bottom Left", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Left", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- + {"Top Left", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
- {0,0,0,0,0,0,0,0,0}
- };
-
- @@ -604,7 +604,7 @@
- Fl_Double_Window* MouseUI::error_window() {
- Fl_Double_Window* w;
- { Fl_Double_Window* o = new Fl_Double_Window(230, 110, gettext("ERROR"));
- - w = o;
- + w = o; if (w) {/* empty */}
- o->user_data((void*)(this));
- { Fl_Button* o = new Fl_Button(75, 65, 60, 30, gettext("QUIT"));
- o->box(FL_FLAT_BOX);
- @@ -623,7 +623,7 @@
- Fl_Double_Window* MouseUI::jwm_window() {
- Fl_Double_Window* w;
- { Fl_Double_Window* o = new Fl_Double_Window(400, 115, gettext("JWM Mouse Settings"));
- - w = o;
- + w = o; if (w) {/* empty */}
- o->user_data((void*)(this));
- { double_click_slider2 = new Fl_Slider(150, 10, 90, 25, gettext("Double Click Speed"));
- double_click_slider2->tooltip(gettext("This sets how fast you must click to Double Click"));
- @@ -709,7 +709,7 @@
- JWM=isJWM();
- deltaChanged = false;
- doubleChanged = false;
- - { Fl_Double_Window* o = mouse_window = new Fl_Double_Window(370, 345, gettext("Touchpad Settings"));
- + { Fl_Double_Window* o = mouse_window = new Fl_Double_Window(370, 345, gettext("Mouse/Touchpad Settings"));
- mouse_window->color(FL_DARK1);
- mouse_window->user_data((void*)(this));
- { Fl_Scroll* o = new Fl_Scroll(-5, 0, 545, 520);
- === modified file 'fltk/jwm-mouse.fld'
- --- fltk/jwm-mouse.fld 2018-01-16 14:17:27 +0000
- +++ fltk/jwm-mouse.fld 2019-01-27 00:36:26 +0000
- @@ -217,7 +217,7 @@
- deltaChanged = false;
- doubleChanged = false;} {}
- Fl_Window mouse_window {
- - label {Touchpad Settings} open
- + label {Mouse/Touchpad Settings} open
- xywh {194 133 370 345} type Double color 47 hide resizable
- code0 {readsynclientoutput();}
- code1 {startup(o,jsm_mouse_xpm);} xclass {jsm-mouse}
- === modified file 'fltk/jwm-mouse.h'
- --- fltk/jwm-mouse.h 2018-01-16 14:17:27 +0000
- +++ fltk/jwm-mouse.h 2019-01-27 00:36:26 +0000
- @@ -21,7 +21,7 @@
- * You may redistribute this, but you must keep this comment in place
- * Jesus is my Lord, and if you don't like it feel free to ignore it.
- */
- -// generated by Fast Light User Interface Designer (fluid) version 1.0303
- +// generated by Fast Light User Interface Designer (fluid) version 1.0304
-
- #ifndef jwm_mouse_h
- #define jwm_mouse_h
|