revisions_292.patch 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277
  1. === modified file 'TODO'
  2. --- TODO 2018-01-16 14:17:27 +0000
  3. +++ TODO 2019-01-27 00:36:26 +0000
  4. @@ -1,3 +1,6 @@
  5. +MAIN program
  6. +run each program without closing main program... so check ifndef/define for xpm icons if inheritance becomes an issue
  7. +
  8. makeWidgetIcon... extend this, or somehow check for some sort of icon or, extend to
  9. have a TRYthisFirst, FALLBACKname sort of condition....
  10. === modified file 'fltk/jwm-mouse.cxx'
  11. --- fltk/jwm-mouse.cxx 2017-01-29 14:15:16 +0000
  12. +++ fltk/jwm-mouse.cxx 2019-01-27 00:36:26 +0000
  13. @@ -21,7 +21,7 @@
  14. * You may redistribute this, but you must keep this comment in place
  15. * Jesus is my Lord, and if you don't like it feel free to ignore it.
  16. */
  17. -// generated by Fast Light User Interface Designer (fluid) version 1.0303
  18. +// generated by Fast Light User Interface Designer (fluid) version 1.0304
  19. #include <libintl.h>
  20. #include "jwm-mouse.h"
  21. @@ -135,9 +135,9 @@
  22. unsigned char MouseUI::menu_TouchpadOff_i18n_done = 0;
  23. Fl_Menu_Item MouseUI::menu_TouchpadOff[] = {
  24. - {"ON", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 12, 0},
  25. - {"Off", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 12, 0},
  26. - {"Tap Off", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 12, 0},
  27. + {"ON", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
  28. + {"Off", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
  29. + {"Tap Off", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
  30. {0,0,0,0,0,0,0,0,0}
  31. };
  32. @@ -186,14 +186,14 @@
  33. unsigned char MouseUI::menu_TapButton1_i18n_done = 0;
  34. Fl_Menu_Item MouseUI::menu_TapButton1[] = {
  35. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  36. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  37. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  38. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  39. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  40. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  41. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  42. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  43. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  44. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  45. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  46. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  47. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  48. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  49. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  50. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  51. {0,0,0,0,0,0,0,0,0}
  52. };
  53. @@ -206,14 +206,14 @@
  54. unsigned char MouseUI::menu_TapButton2_i18n_done = 0;
  55. Fl_Menu_Item MouseUI::menu_TapButton2[] = {
  56. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  57. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  58. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  59. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  60. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  61. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  62. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  63. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  64. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  65. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  66. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  67. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  68. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  69. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  70. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  71. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  72. {0,0,0,0,0,0,0,0,0}
  73. };
  74. @@ -226,14 +226,14 @@
  75. unsigned char MouseUI::menu_TapButton3_i18n_done = 0;
  76. Fl_Menu_Item MouseUI::menu_TapButton3[] = {
  77. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  78. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  79. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  80. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  81. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  82. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  83. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  84. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  85. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  86. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  87. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  88. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  89. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  90. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  91. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  92. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  93. {0,0,0,0,0,0,0,0,0}
  94. };
  95. @@ -246,14 +246,14 @@
  96. unsigned char MouseUI::menu_LTCornerButton_i18n_done = 0;
  97. Fl_Menu_Item MouseUI::menu_LTCornerButton[] = {
  98. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  99. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  100. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  101. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  102. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  103. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  104. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  105. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  106. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  107. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  108. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  109. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  110. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  111. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  112. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  113. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  114. {0,0,0,0,0,0,0,0,0}
  115. };
  116. @@ -266,14 +266,14 @@
  117. unsigned char MouseUI::menu_RTCornerButton_i18n_done = 0;
  118. Fl_Menu_Item MouseUI::menu_RTCornerButton[] = {
  119. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  120. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  121. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  122. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  123. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  124. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  125. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  126. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  127. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  128. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  129. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  130. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  131. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  132. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  133. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  134. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  135. {0,0,0,0,0,0,0,0,0}
  136. };
  137. @@ -286,14 +286,14 @@
  138. unsigned char MouseUI::menu_LBCornerButton_i18n_done = 0;
  139. Fl_Menu_Item MouseUI::menu_LBCornerButton[] = {
  140. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  141. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  142. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  143. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  144. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  145. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  146. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  147. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  148. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  149. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  150. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  151. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  152. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  153. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  154. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  155. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  156. {0,0,0,0,0,0,0,0,0}
  157. };
  158. @@ -306,14 +306,14 @@
  159. unsigned char MouseUI::menu_RBCornerButton_i18n_done = 0;
  160. Fl_Menu_Item MouseUI::menu_RBCornerButton[] = {
  161. - {"disable", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  162. - {"left button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  163. - {"center button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  164. - {"right button", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  165. - {"up wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  166. - {"down wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  167. - {"left wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  168. - {"right wheel", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  169. + {"disable", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  170. + {"left button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  171. + {"center button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  172. + {"right button", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  173. + {"up wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  174. + {"down wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  175. + {"left wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  176. + {"right wheel", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  177. {0,0,0,0,0,0,0,0,0}
  178. };
  179. @@ -403,15 +403,15 @@
  180. unsigned char MouseUI::menu_CircScrollTrigger_i18n_done = 0;
  181. Fl_Menu_Item MouseUI::menu_CircScrollTrigger[] = {
  182. - {"Everywhere", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  183. - {"Top", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  184. - {"Top Right", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  185. - {"Right", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  186. - {"Bottom Right", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  187. - {"Bottom", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  188. - {"Bottom Left", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  189. - {"Left", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  190. - {"Top Left", 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
  191. + {"Everywhere", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  192. + {"Top", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  193. + {"Top Right", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  194. + {"Right", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  195. + {"Bottom Right", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  196. + {"Bottom", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  197. + {"Bottom Left", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  198. + {"Left", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  199. + {"Top Left", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  200. {0,0,0,0,0,0,0,0,0}
  201. };
  202. @@ -604,7 +604,7 @@
  203. Fl_Double_Window* MouseUI::error_window() {
  204. Fl_Double_Window* w;
  205. { Fl_Double_Window* o = new Fl_Double_Window(230, 110, gettext("ERROR"));
  206. - w = o;
  207. + w = o; if (w) {/* empty */}
  208. o->user_data((void*)(this));
  209. { Fl_Button* o = new Fl_Button(75, 65, 60, 30, gettext("QUIT"));
  210. o->box(FL_FLAT_BOX);
  211. @@ -623,7 +623,7 @@
  212. Fl_Double_Window* MouseUI::jwm_window() {
  213. Fl_Double_Window* w;
  214. { Fl_Double_Window* o = new Fl_Double_Window(400, 115, gettext("JWM Mouse Settings"));
  215. - w = o;
  216. + w = o; if (w) {/* empty */}
  217. o->user_data((void*)(this));
  218. { double_click_slider2 = new Fl_Slider(150, 10, 90, 25, gettext("Double Click Speed"));
  219. double_click_slider2->tooltip(gettext("This sets how fast you must click to Double Click"));
  220. @@ -709,7 +709,7 @@
  221. JWM=isJWM();
  222. deltaChanged = false;
  223. doubleChanged = false;
  224. - { Fl_Double_Window* o = mouse_window = new Fl_Double_Window(370, 345, gettext("Touchpad Settings"));
  225. + { Fl_Double_Window* o = mouse_window = new Fl_Double_Window(370, 345, gettext("Mouse/Touchpad Settings"));
  226. mouse_window->color(FL_DARK1);
  227. mouse_window->user_data((void*)(this));
  228. { Fl_Scroll* o = new Fl_Scroll(-5, 0, 545, 520);
  229. === modified file 'fltk/jwm-mouse.fld'
  230. --- fltk/jwm-mouse.fld 2018-01-16 14:17:27 +0000
  231. +++ fltk/jwm-mouse.fld 2019-01-27 00:36:26 +0000
  232. @@ -217,7 +217,7 @@
  233. deltaChanged = false;
  234. doubleChanged = false;} {}
  235. Fl_Window mouse_window {
  236. - label {Touchpad Settings} open
  237. + label {Mouse/Touchpad Settings} open
  238. xywh {194 133 370 345} type Double color 47 hide resizable
  239. code0 {readsynclientoutput();}
  240. code1 {startup(o,jsm_mouse_xpm);} xclass {jsm-mouse}
  241. === modified file 'fltk/jwm-mouse.h'
  242. --- fltk/jwm-mouse.h 2018-01-16 14:17:27 +0000
  243. +++ fltk/jwm-mouse.h 2019-01-27 00:36:26 +0000
  244. @@ -21,7 +21,7 @@
  245. * You may redistribute this, but you must keep this comment in place
  246. * Jesus is my Lord, and if you don't like it feel free to ignore it.
  247. */
  248. -// generated by Fast Light User Interface Designer (fluid) version 1.0303
  249. +// generated by Fast Light User Interface Designer (fluid) version 1.0304
  250. #ifndef jwm_mouse_h
  251. #define jwm_mouse_h