Startsida Utforska Hjälp
Logga in
Marcoapc
/
voidpkgs
Bevaka 1
Stjärnmärk 0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Träd: 10c74cd42c
Grenar Taggar
voidpkgs
/
srcpkgs
/
jwm-settings-manager
/
patches
/
revisions_290.patch

revisions_290.patch 28 KB
Historik Rå

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418 
  1. === modified file 'fltk/jwm-keyboard.cxx'
    2. 

  2. --- fltk/jwm-keyboard.cxx	2018-10-03 19:59:48 +0000
    3. 

  3. +++ fltk/jwm-keyboard.cxx	2018-11-06 13:57:39 +0000
    4. 

  4. @@ -21,7 +21,7 @@
    5. 

  5.   * You may redistribute this, but you must keep this comment in place
    6. 

  6.   * Jesus is my Lord, and if you don't like it feel free to ignore it.
    7. 

  7.   */
    8. 

  8. -// generated by Fast Light User Interface Designer (fluid) version 1.0303
    9. 

  9. +// generated by Fast Light User Interface Designer (fluid) version 1.0304
    10. 

  10.  
    11. 

  11.  #include <libintl.h>
    12. 

  12.  #include "jwm-keyboard.h"
    13. 

  13. @@ -408,39 +408,39 @@
    14. 

  14.  
    15. 

  15.  unsigned char KeyboardUI::menu_Action_i18n_done = 0;
    16. 

  16.  Fl_Menu_Item KeyboardUI::menu_Action[] = {
    17. 

  17. - {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    18. 

  18. - {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    19. 

  19. - {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    20. 

  20. - {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    21. 

  21. - {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    22. 

  22. - {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    23. 

  23. - {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    24. 

  24. - {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    25. 

  25. - {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    26. 

  26. - {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    27. 

  27. - {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    28. 

  28. - {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    29. 

  29. - {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    30. 

  30. - {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    31. 

  31. - {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    32. 

  32. - {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    33. 

  33. - {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    34. 

  34. - {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    35. 

  35. - {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    36. 

  36. - {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    37. 

  37. - {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    38. 

  38. - {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    39. 

  39. - {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    40. 

  40. - {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    41. 

  41. - {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    42. 

  42. - {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    43. 

  43. - {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    44. 

  44. - {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    45. 

  45. - {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    46. 

  46. - {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    47. 

  47. - {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    48. 

  48. - {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    49. 

  49. - {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    50. 

  50. + {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    51. 

  51. + {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    52. 

  52. + {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    53. 

  53. + {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    54. 

  54. + {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    55. 

  55. + {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    56. 

  56. + {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    57. 

  57. + {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    58. 

  58. + {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    59. 

  59. + {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    60. 

  60. + {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    61. 

  61. + {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    62. 

  62. + {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    63. 

  63. + {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    64. 

  64. + {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    65. 

  65. + {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    66. 

  66. + {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    67. 

  67. + {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    68. 

  68. + {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    69. 

  69. + {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    70. 

  70. + {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    71. 

  71. + {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    72. 

  72. + {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    73. 

  73. + {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    74. 

  74. + {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    75. 

  75. + {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    76. 

  76. + {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    77. 

  77. + {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    78. 

  78. + {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    79. 

  79. + {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    80. 

  80. + {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    81. 

  81. + {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    82. 

  82. + {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    83. 

  83.   {0,0,0,0,0,0,0,0,0}
    84. 

  84.  };
    85. 

  85.  Fl_Menu_Item* KeyboardUI::next1 = KeyboardUI::menu_Action + 0;
    86. 

  86. @@ -613,22 +613,22 @@
    87. 

  87.  
    88. 

  88.  unsigned char KeyboardUI::menu_Special_i18n_done = 0;
    89. 

  89.  Fl_Menu_Item KeyboardUI::menu_Special[] = {
    90. 

  90. - {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    91. 

  91. - {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    92. 

  92. - {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    93. 

  93. - {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    94. 

  94. - {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    95. 

  95. - {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    96. 

  96. - {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    97. 

  97. - {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    98. 

  98. - {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    99. 

  99. - {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    100. 

  100. - {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    101. 

  101. - {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    102. 

  102. - {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    103. 

  103. - {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    104. 

  104. - {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    105. 

  105. - {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    106. 

  106. + {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    107. 

  107. + {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    108. 

  108. + {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    109. 

  109. + {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    110. 

  110. + {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    111. 

  111. + {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    112. 

  112. + {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    113. 

  113. + {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    114. 

  114. + {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    115. 

  115. + {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    116. 

  116. + {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    117. 

  117. + {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    118. 

  118. + {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    119. 

  119. + {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    120. 

  120. + {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    121. 

  121. + {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    122. 

  122.   {0,0,0,0,0,0,0,0,0}
    123. 

  123.  };
    124. 

  124.  
    125. 

  125. @@ -962,39 +962,39 @@
    126. 

  126.  
    127. 

  127.  unsigned char KeyboardUI::menu_Action1_i18n_done = 0;
    128. 

  128.  Fl_Menu_Item KeyboardUI::menu_Action1[] = {
    129. 

  129. - {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    130. 

  130. - {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    131. 

  131. - {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    132. 

  132. - {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    133. 

  133. - {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    134. 

  134. - {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    135. 

  135. - {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    136. 

  136. - {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    137. 

  137. - {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    138. 

  138. - {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    139. 

  139. - {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    140. 

  140. - {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    141. 

  141. - {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    142. 

  142. - {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    143. 

  143. - {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    144. 

  144. - {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    145. 

  145. - {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    146. 

  146. - {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    147. 

  147. - {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    148. 

  148. - {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    149. 

  149. - {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    150. 

  150. - {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    151. 

  151. - {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    152. 

  152. - {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    153. 

  153. - {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    154. 

  154. - {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    155. 

  155. - {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    156. 

  156. - {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    157. 

  157. - {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    158. 

  158. - {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    159. 

  159. - {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    160. 

  160. - {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    161. 

  161. - {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    162. 

  162. + {"move to the next window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_next, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    163. 

  163. + {"move to the next window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_nextstacked, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    164. 

  164. + {"move to the previous window in the task list", 0,  (Fl_Callback*)KeyboardUI::cb_prev, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    165. 

  165. + {"move to the previous window in the stacking order", 0,  (Fl_Callback*)KeyboardUI::cb_prevstacked, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    166. 

  166. + {"close window", 0,  (Fl_Callback*)KeyboardUI::cb_close, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    167. 

  167. + {"fullscreen window", 0,  (Fl_Callback*)KeyboardUI::cb_fullscreen, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    168. 

  168. + {"minimize window", 0,  (Fl_Callback*)KeyboardUI::cb_minimize, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    169. 

  169. + {"maximize window", 0,  (Fl_Callback*)KeyboardUI::cb_maximize, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    170. 

  170. + {"roll up window", 0,  (Fl_Callback*)KeyboardUI::cb_shade, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    171. 

  171. + {"move window", 0,  (Fl_Callback*)KeyboardUI::cb_move, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    172. 

  172. + {"resize window", 0,  (Fl_Callback*)KeyboardUI::cb_resize, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    173. 

  173. + {"show window menu", 0,  (Fl_Callback*)KeyboardUI::cb_window, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    174. 

  174. + {"Show Application menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_apps, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    175. 

  175. + {"Show Places Menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_places, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    176. 

  176. + {"Show Shutdown menu", 0,  (Fl_Callback*)KeyboardUI::cb_root_menu_shutdown, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    177. 

  177. + {"move one desktop to the right", 0,  (Fl_Callback*)KeyboardUI::cb_rdesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    178. 

  178. + {"move one desktop to the left", 0,  (Fl_Callback*)KeyboardUI::cb_ldesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    179. 

  179. + {"move one desktop up", 0,  (Fl_Callback*)KeyboardUI::cb_udesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    180. 

  180. + {"move one desktop down", 0,  (Fl_Callback*)KeyboardUI::cb_ddesktop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    181. 

  181. + {"restart the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_restart, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    182. 

  182. + {"exit the Window Manager", 0,  (Fl_Callback*)KeyboardUI::cb_exit, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    183. 

  183. + {"Show any hidden Panels", 0,  (Fl_Callback*)KeyboardUI::cb_showtray, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    184. 

  184. + {"Maximize to the Top of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxtop, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    185. 

  185. + {"Maximize to the Bottom of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxbottom, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    186. 

  186. + {"Maximize to the Left of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxleft, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    187. 

  187. + {"Maximize to the Right of the screen", 0,  (Fl_Callback*)KeyboardUI::cb_maxright, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    188. 

  188. + {"Maximize Vertical", 0,  (Fl_Callback*)KeyboardUI::cb_maxv, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    189. 

  189. + {"Maximize Horizontal", 0,  (Fl_Callback*)KeyboardUI::cb_maxh, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    190. 

  190. + {"Send Window Up a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendu, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    191. 

  191. + {"Send Window Down a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendd, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    192. 

  192. + {"Send Window Right a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendr, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    193. 

  193. + {"Send Window Left a Desktop", 0,  (Fl_Callback*)KeyboardUI::cb_sendl, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    194. 

  194. + {"Restore a minimized window", 0,  (Fl_Callback*)KeyboardUI::cb_restore, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    195. 

  195.   {0,0,0,0,0,0,0,0,0}
    196. 

  196.  };
    197. 

  197.  Fl_Menu_Item* KeyboardUI::next = KeyboardUI::menu_Action1 + 0;
    198. 

  198. @@ -1167,22 +1167,22 @@
    199. 

  199.  
    200. 

  200.  unsigned char KeyboardUI::menu_Special1_i18n_done = 0;
    201. 

  201.  Fl_Menu_Item KeyboardUI::menu_Special1[] = {
    202. 

  202. - {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    203. 

  203. - {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    204. 

  204. - {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    205. 

  205. - {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    206. 

  206. - {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    207. 

  207. - {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    208. 

  208. - {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    209. 

  209. - {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    210. 

  210. - {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    211. 

  211. - {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    212. 

  212. - {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    213. 

  213. - {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    214. 

  214. - {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    215. 

  215. - {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    216. 

  216. - {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    217. 

  217. - {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW1, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
    218. 

  218. + {"XF86Tools", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Tools1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    219. 

  219. + {"XF86Search", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Search1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    220. 

  220. + {"XF86LaunchA", 0,  (Fl_Callback*)KeyboardUI::cb_XF86LaunchA1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    221. 

  221. + {"XF86Explorer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Explorer1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    222. 

  222. + {"XF86Display", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Display1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    223. 

  223. + {"XF86PowerOff", 0,  (Fl_Callback*)KeyboardUI::cb_XF86PowerOff1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    224. 

  224. + {"XF86AudioMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMute1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    225. 

  225. + {"XF86AudioRaiseVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioRaiseVolume1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    226. 

  226. + {"XF86AudioLowerVolume", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioLowerVolume1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    227. 

  227. + {"XF86MonBrightnessDown", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessDown1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    228. 

  228. + {"XF86MonBrightnessUp", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MonBrightnessUp1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    229. 

  229. + {"XF86Calculator", 0,  (Fl_Callback*)KeyboardUI::cb_XF86Calculator1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    230. 

  230. + {"XF86AudioMicMute", 0,  (Fl_Callback*)KeyboardUI::cb_XF86AudioMicMute1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    231. 

  231. + {"XF86HomePage", 0,  (Fl_Callback*)KeyboardUI::cb_XF86HomePage1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    232. 

  232. + {"XF86MyComputer", 0,  (Fl_Callback*)KeyboardUI::cb_XF86MyComputer1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    233. 

  233. + {"XF86WWW", 0,  (Fl_Callback*)KeyboardUI::cb_XF86WWW1, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0},
    234. 

  234.   {0,0,0,0,0,0,0,0,0}
    235. 

  235.  };
    236. 

  236.  
    237. 

  237. @@ -1308,7 +1308,10 @@
    238. 

  238.  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,
    239. 

  239.  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,
    240. 

  240.  0,0,0,0,0,0,0,0,0,0,0};
    241. 

  241. -static Fl_RGB_Image image_gear16(idata_gear16, 24, 24, 2, 0);
    242. 

  242. +static Fl_Image *image_gear16() {
    243. 

  243. +  static Fl_Image *image = new Fl_RGB_Image(idata_gear16, 24, 24, 2, 0);
    244. 

  244. +  return image;
    245. 

  245. +}
    246. 

  246.  
    247. 

  247.  void KeyboardUI::cb_Layout1_i(Fl_Button*, void*) {
    248. 

  248.    layout_window()->show();
    249. 

  249. @@ -1429,7 +1432,7 @@
    250. 

  250.      } // Fl_Menu_Button* o
    251. 

  251.      debug_out("config_key_win()->show()");
    252. 

  252.      startup(o,jsm_keyboard_xpm);
    253. 

  253. -    o->wait_for_expose();
    254. 

  254. +    o->wait_for_expose(); #endif
    255. 

  255.      conf_key_win->xclass("jsm-keyboard");
    256. 

  256.      conf_key_win->end();
    257. 

  257.    } // Fl_Double_Window* conf_key_win
    258. 

  258. @@ -1636,14 +1639,14 @@
    259. 

  259.        { Fl_Button* o = new Fl_Button(100, 260, 30, 30);
    260. 

  260.          o->box(FL_FLAT_BOX);
    261. 

  261.          o->color((Fl_Color)23);
    262. 

  262. -        o->image(image_gear16);
    263. 

  263. +        o->image( image_gear16() );
    264. 

  264.          o->labelfont(1);
    265. 

  265.          o->callback((Fl_Callback*)cb_2);
    266. 

  266.        } // Fl_Button* o
    267. 

  267.        { Fl_Button* o = new Fl_Button(185, 260, 100, 30, gettext("Layout"));
    268. 

  268.          o->box(FL_FLAT_BOX);
    269. 

  269.          o->color((Fl_Color)23);
    270. 

  270. -        o->image(image_gear16);
    271. 

  271. +        o->image( image_gear16() );
    272. 

  272.          o->labelfont(1);
    273. 

  273.          o->callback((Fl_Callback*)cb_Layout1);
    274. 

  274.          o->align(Fl_Align(256));
    275. 

  275. 

  276. === modified file 'fltk/jwm-keyboard.fld'
    277. 

  277. --- fltk/jwm-keyboard.fld	2018-10-03 19:59:48 +0000
    278. 

  278. +++ fltk/jwm-keyboard.fld	2018-11-06 13:57:39 +0000
    279. 

  279. @@ -1,9 +1,9 @@
    280. 

  280.  # data file for the Fltk User Interface Designer (fluid)
    281. 

  281. -version 1.0303 
    282. 

  282. -i18n_type 1 
    283. 

  283. -i18n_include <libintl.h> 
    284. 

  284. -i18n_function gettext 
    285. 

  285. -header_name {.h} 
    286. 

  286. +version 1.0304
    287. 

  287. +i18n_type 1
    288. 

  288. +i18n_include <libintl.h>
    289. 

  289. +i18n_function gettext
    290. 

  290. +header_name {.h}
    291. 

  291.  code_name {.cxx}
    292. 

  292.  comment {/*                 Joe's Window Manager Configuration
    293. 

  293.   *
    294. 

  294. @@ -28,34 +28,34 @@
    295. 

  295.   * You may redistribute this, but you must keep this comment in place
    296. 

  296.   * Jesus is my Lord, and if you don't like it feel free to ignore it.
    297. 

  297.   */} {in_source in_header
    298. 

  298. -} 
    299. 

  299. +}
    300. 

  300.  
    301. 

  301.  decl {\#include <libintl.h>} {public global
    302. 

  302. -} 
    303. 

  303. +}
    304. 

  304.  
    305. 

  305.  decl {\#include <FL/Fl_File_Chooser.H>} {public global
    306. 

  306. -} 
    307. 

  307. +}
    308. 

  308.  
    309. 

  309.  decl {\#include <string>} {public global
    310. 

  310. -} 
    311. 

  311. +}
    312. 

  312.  
    313. 

  313.  decl {\#include <stdlib.h>} {public global
    314. 

  314. -} 
    315. 

  315. +}
    316. 

  316.  
    317. 

  317.  decl {\#include <iostream>} {public global
    318. 

  318. -} 
    319. 

  319. +}
    320. 

  320.  
    321. 

  321.  decl {\#include "../include/jwmrc.hpp"} {public global
    322. 

  322. -} 
    323. 

  323. +}
    324. 

  324.  
    325. 

  325.  decl {\#include "../include/ui.hpp"} {public global
    326. 

  326. -} 
    327. 

  327. +}
    328. 

  328.  
    329. 

  329.  decl {\#include "../include/keyboard.hpp"} {public global
    330. 

  330. -} 
    331. 

  331. +}
    332. 

  332.  
    333. 

  333.  decl {\#include "../data/icons/jsm-keyboard.xpm"} {public global
    334. 

  334. -} 
    335. 

  335. +}
    336. 

  336.  
    337. 

  337.  decl {struct keycode_table{int n; const char* text;} table[] = {
    338. 

  338.    {FL_Escape, "Escape"},
    339. 

  339. @@ -104,7 +104,7 @@
    340. 

  340.    {FL_Sleep,"XF86Standby"},
    341. 

  341.    {FL_Favorites,"XF86Favorites"}
    342. 

  342.  };} {private global
    343. 

  343. -} 
    344. 

  344. +}
    345. 

  345.  
    346. 

  346.  class KeyboardUI {open : {public JWM_Keyboard}
    347. 

  347.  } {
    348. 

  348. @@ -113,11 +113,12 @@
    349. 

  349.    Function {config_key_win()} {open
    350. 

  350.    } {
    351. 

  351.      Fl_Window conf_key_win {
    352. 

  352. -      label {Configure Keyboard Shortcut} open
    353. 

  353. +      label {Configure Keyboard Shortcut} open selected
    354. 

  354.        xywh {895 387 355 180} type Double
    355. 

  355.        code0 {debug_out("config_key_win()->show()");}
    356. 

  356.        code1 {startup(o,jsm_keyboard_xpm);}
    357. 

  357. -      code2 {o->wait_for_expose();} xclass {jsm-keyboard} visible
    358. 

  358. +      code2 {\#if FL_PATCH_VERSION == 4}
    359. 

  359. +      code3 {o->wait_for_expose(); \#endif} xclass {jsm-keyboard} visible
    360. 

  360.      } {
    361. 

  361.        Fl_Button {} {
    362. 

  362.          label OK
    363. 

  363. @@ -985,14 +986,14 @@
    364. 

  364.  //Fl::add_handler(handle);} {}
    365. 

  365.      Fl_Window keyboard_window {
    366. 

  366.        label {Keyboard Settings} open
    367. 

  367. -      xywh {882 85 480 295} type Double color 31 resizable
    368. 

  368. -      code0 {startup(o,jsm_keyboard_xpm);} xclass {jsm-keyboard} visible
    369. 

  369. +      xywh {882 85 480 295} type Double color 31 hide resizable
    370. 

  370. +      code0 {startup(o,jsm_keyboard_xpm);} xclass {jsm-keyboard}
    371. 

  371.      } {
    372. 

  372.        Fl_Scroll {} {open
    373. 

  373.          xywh {0 0 490 310} color 31 resizable
    374. 

  374.        } {
    375. 

  375.          Fl_Browser key_browser {
    376. 

  376. -          label {Keyboard Shortcuts} selected
    377. 

  377. +          label {Keyboard Shortcuts}
    378. 

  378.            xywh {5 20 470 235} type Hold box FLAT_BOX selection_color 80 labelfont 1 align 1
    379. 

  379.            code1 {static int widths[] = {50,175,105,0};o->column_widths(widths);}
    380. 

  380.            code2 {o->column_char(DELIM);}
    381. 

  381. @@ -1089,7 +1090,7 @@
    382. 

  382.    o->redraw();
    383. 

  383.  }} {}
    384. 

  384.    }
    385. 

  385. -} 
    386. 

  386. +}
    387. 

  387.  
    388. 

  388.  Function {handle(int e)} {open return_type int
    389. 

  389.  } {
    390. 

  390. @@ -1099,4 +1100,4 @@
    391. 

  391.    return 1;
    392. 

  392.  }
    393. 

  393.  return (e == FL_SHORTCUT);} {}
    394. 

  394. -} 
    395. 

  395. +}
    396. 

  396. 

  397. === modified file 'fltk/jwm-keyboard.h'
    398. 

  398. --- fltk/jwm-keyboard.h	2018-01-16 14:17:27 +0000
    399. 

  399. +++ fltk/jwm-keyboard.h	2018-11-06 13:57:39 +0000
    400. 

  400. @@ -21,7 +21,7 @@
    401. 

  401.   * You may redistribute this, but you must keep this comment in place
    402. 

  402.   * Jesus is my Lord, and if you don't like it feel free to ignore it.
    403. 

  403.   */
    404. 

  404. -// generated by Fast Light User Interface Designer (fluid) version 1.0303
    405. 

  405. +// generated by Fast Light User Interface Designer (fluid) version 1.0304
    406. 

  406.  
    407. 

  407.  #ifndef jwm_keyboard_h
    408. 

  408.  #define jwm_keyboard_h
    409. 

  409. @@ -36,6 +36,7 @@
    410. 

  410.  #include "../include/keyboard.hpp"
    411. 

  411.  #include "../data/icons/jsm-keyboard.xpm"
    412. 

  412.  #include <FL/Fl_Double_Window.H>
    413. 

  413. +#if FL_PATCH_VERSION == 4
    414. 

  414.  #include <FL/Fl_Button.H>
    415. 

  415.  #include <FL/Fl_Menu_Button.H>
    416. 

  416.  #include <FL/Fl_Input.H>
    417. 

  417. 

  418.