Add 14th bit to XK_SWITCH_MOD bitmask

[st.git] / x.c

diff --git a/x.c b/x.c
index 8bf998e..248d505 100644 (file)
--- a/x.c
+++ b/x.c
@@ -48,7 +48,7 @@ typedef struct {
 /* X modifiers */
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
 /* X modifiers */
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0

-#define XK_SWITCH_MOD (1<<13)
+#define XK_SWITCH_MOD (1<<13|1<<14)

 
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);
 
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);


@@ -156,7 +156,7 @@ static void xresize(int, int);
 static void xhints(void);
 static int xloadcolor(int, const char *, Color *);
 static int xloadfont(Font *, FcPattern *);
 static void xhints(void);
 static int xloadcolor(int, const char *, Color *);
 static int xloadfont(Font *, FcPattern *);

-static void xloadfonts(char *, double);
+static void xloadfonts(const char *, double);

 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xsetenv(void);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xsetenv(void);


@@ -952,7 +952,7 @@ xloadfont(Font *f, FcPattern *pattern)
 }
 
 void
 }
 
 void

-xloadfonts(char *fontstr, double fontsize)
+xloadfonts(const char *fontstr, double fontsize)

 {
        FcPattern *pattern;
        double fontval;
 {
        FcPattern *pattern;
        double fontval;


@@ -960,7 +960,7 @@ xloadfonts(char *fontstr, double fontsize)
        if (fontstr[0] == '-')
                pattern = XftXlfdParse(fontstr, False, False);
        else
        if (fontstr[0] == '-')
                pattern = XftXlfdParse(fontstr, False, False);
        else

-               pattern = FcNameParse((FcChar8 *)fontstr);
+               pattern = FcNameParse((const FcChar8 *)fontstr);

 
        if (!pattern)
                die("can't open font %s\n", fontstr);
 
        if (!pattern)
                die("can't open font %s\n", fontstr);