Changes relate to modelock.

src/screen.h

@@ -47,6 +47,9 @@ typedef struct WFont {
 #define WTB_UNFOCUSED	2
 #define WTB_PFOCUSED	4
 #define WTB_MENU	6
+#ifdef XKB_BUTTON_HINT
+#define WTB_THAI    7
+#endif
 
 #ifdef GNOME_STUFF
 /* an area of the screen reserved by some window */
@@ -260,7 +263,11 @@ typedef struct _WScreen {
     struct WDialogData *dialog_data;
 
 #ifdef NEWSTUFF
+#ifdef XKB_BUTTON_HINT
+    struct RImage *button_images[3][PRED_BPIXMAPS];
+#else
     struct RImage *button_images[2][PRED_BPIXMAPS];/* scaled tbar btn images */
+#endif
 #endif
 
     /* state and other informations */