voidpkgs/srcpkgs/jwm-settings-manager/patches/revisions_290.patch

=== modified file 'fltk/jwm-keyboard.cxx'
--- fltk/jwm-keyboard.cxx	2018-10-03 19:59:48 +0000
+++ fltk/jwm-keyboard.cxx	2018-11-06 13:57:39 +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-keyboard.h"
@@ -408,39 +408,39 @@
 
 unsigned char KeyboardUI::menu_Action_i18n_done = 0;
 Fl_Menu_Item KeyboardUI::menu_Action[] = {
- {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 Fl_Menu_Item* KeyboardUI::next1 = KeyboardUI::menu_Action + 0;
@@ -613,22 +613,22 @@
 
 unsigned char KeyboardUI::menu_Special_i18n_done = 0;
 Fl_Menu_Item KeyboardUI::menu_Special[] = {
- {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -962,39 +962,39 @@
 
 unsigned char KeyboardUI::menu_Action1_i18n_done = 0;
 Fl_Menu_Item KeyboardUI::menu_Action1[] = {
- {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 Fl_Menu_Item* KeyboardUI::next = KeyboardUI::menu_Action1 + 0;
@@ -1167,22 +1167,22 @@
 
 unsigned char KeyboardUI::menu_Special1_i18n_done = 0;
 Fl_Menu_Item KeyboardUI::menu_Special1[] = {
- {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
- {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
+ {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -1308,7 +1308,10 @@
 149,0,255,0,255,0,255,0,255,0,147,0,2,0,0,0,20,0,46,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,148,0,255,0,252,0,252,0,255,0,146,0,2,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0};
-static Fl_RGB_Image image_gear16(idata_gear16, 24, 24, 2, 0);
+static Fl_Image *image_gear16() {
+  static Fl_Image *image = new Fl_RGB_Image(idata_gear16, 24, 24, 2, 0);
+  return image;
+}
 
 void KeyboardUI::cb_Layout1_i(Fl_Button*, void*) {
   layout_window()->show();
@@ -1429,7 +1432,7 @@
     } // Fl_Menu_Button* o
     debug_out("config_key_win()->show()");
     startup(o,jsm_keyboard_xpm);
-    o->wait_for_expose();
+    o->wait_for_expose(); #endif
     conf_key_win->xclass("jsm-keyboard");
     conf_key_win->end();
   } // Fl_Double_Window* conf_key_win
@@ -1636,14 +1639,14 @@
       { Fl_Button* o = new Fl_Button(100, 260, 30, 30);
         o->box(FL_FLAT_BOX);
         o->color((Fl_Color)23);
-        o->image(image_gear16);
+        o->image( image_gear16() );
         o->labelfont(1);
         o->callback((Fl_Callback*)cb_2);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(185, 260, 100, 30, gettext("Layout"));
         o->box(FL_FLAT_BOX);
         o->color((Fl_Color)23);
-        o->image(image_gear16);
+        o->image( image_gear16() );
         o->labelfont(1);
         o->callback((Fl_Callback*)cb_Layout1);
         o->align(Fl_Align(256));

=== modified file 'fltk/jwm-keyboard.fld'
--- fltk/jwm-keyboard.fld	2018-10-03 19:59:48 +0000
+++ fltk/jwm-keyboard.fld	2018-11-06 13:57:39 +0000
@@ -1,9 +1,9 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0303 
-i18n_type 1 
-i18n_include <libintl.h> 
-i18n_function gettext 
-header_name {.h} 
+version 1.0304
+i18n_type 1
+i18n_include <libintl.h>
+i18n_function gettext
+header_name {.h}
 code_name {.cxx}
 comment {/*                 Joe's Window Manager Configuration
  *
@@ -28,34 +28,34 @@
  * 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.
  */} {in_source in_header
-} 
+}
 
 decl {\#include <libintl.h>} {public global
-} 
+}
 
 decl {\#include <FL/Fl_File_Chooser.H>} {public global
-} 
+}
 
 decl {\#include <string>} {public global
-} 
+}
 
 decl {\#include <stdlib.h>} {public global
-} 
+}
 
 decl {\#include <iostream>} {public global
-} 
+}
 
 decl {\#include "../include/jwmrc.hpp"} {public global
-} 
+}
 
 decl {\#include "../include/ui.hpp"} {public global
-} 
+}
 
 decl {\#include "../include/keyboard.hpp"} {public global
-} 
+}
 
 decl {\#include "../data/icons/jsm-keyboard.xpm"} {public global
-} 
+}
 
 decl {struct keycode_table{int n; const char* text;} table[] = {
   {FL_Escape, "Escape"},
@@ -104,7 +104,7 @@
   {FL_Sleep,"XF86Standby"},
   {FL_Favorites,"XF86Favorites"}
 };} {private global
-} 
+}
 
 class KeyboardUI {open : {public JWM_Keyboard}
 } {
@@ -113,11 +113,12 @@
   Function {config_key_win()} {open
   } {
     Fl_Window conf_key_win {
-      label {Configure Keyboard Shortcut} open
+      label {Configure Keyboard Shortcut} open selected
       xywh {895 387 355 180} type Double
       code0 {debug_out("config_key_win()->show()");}
       code1 {startup(o,jsm_keyboard_xpm);}
-      code2 {o->wait_for_expose();} xclass {jsm-keyboard} visible
+      code2 {\#if FL_PATCH_VERSION == 4}
+      code3 {o->wait_for_expose(); \#endif} xclass {jsm-keyboard} visible
     } {
       Fl_Button {} {
         label OK
@@ -985,14 +986,14 @@
 //Fl::add_handler(handle);} {}
     Fl_Window keyboard_window {
       label {Keyboard Settings} open
-      xywh {882 85 480 295} type Double color 31 resizable
-      code0 {startup(o,jsm_keyboard_xpm);} xclass {jsm-keyboard} visible
+      xywh {882 85 480 295} type Double color 31 hide resizable
+      code0 {startup(o,jsm_keyboard_xpm);} xclass {jsm-keyboard}
     } {
       Fl_Scroll {} {open
         xywh {0 0 490 310} color 31 resizable
       } {
         Fl_Browser key_browser {
-          label {Keyboard Shortcuts} selected
+          label {Keyboard Shortcuts}
           xywh {5 20 470 235} type Hold box FLAT_BOX selection_color 80 labelfont 1 align 1
           code1 {static int widths[] = {50,175,105,0};o->column_widths(widths);}
           code2 {o->column_char(DELIM);}
@@ -1089,7 +1090,7 @@
   o->redraw();
 }} {}
   }
-} 
+}
 
 Function {handle(int e)} {open return_type int
 } {
@@ -1099,4 +1100,4 @@
   return 1;
 }
 return (e == FL_SHORTCUT);} {}
-} 
+}

=== modified file 'fltk/jwm-keyboard.h'
--- fltk/jwm-keyboard.h	2018-01-16 14:17:27 +0000
+++ fltk/jwm-keyboard.h	2018-11-06 13:57:39 +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_keyboard_h
 #define jwm_keyboard_h
@@ -36,6 +36,7 @@
 #include "../include/keyboard.hpp"
 #include "../data/icons/jsm-keyboard.xpm"
 #include <FL/Fl_Double_Window.H>
+#if FL_PATCH_VERSION == 4
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Menu_Button.H>
 #include <FL/Fl_Input.H>