Added tag 1.6 for changeset dcc5427f99f51a978386a0dd770467cd911ac84b

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 7228cb6..743967a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -5,6 +5,7 @@
 #include "dmenu.h"
 
 #include <ctype.h>
 #include "dmenu.h"
 
 #include <ctype.h>

+#include <locale.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>


@@ -144,7 +145,7 @@ kpress(XKeyEvent * e) {
 
        len = strlen(text);
        buf[0] = 0;
 
        len = strlen(text);
        buf[0] = 0;

-       num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
+       num = XLookupString(e, buf, sizeof buf, &ksym, 0);

        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                        || IsPrivateKeypadKey(ksym))
        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                        || IsPrivateKeypadKey(ksym))


@@ -181,7 +182,7 @@ kpress(XKeyEvent * e) {
        case XK_Tab:
                if(!sel)
                        return;
        case XK_Tab:
                if(!sel)
                        return;

-               strncpy(text, sel->text, sizeof(text));
+               strncpy(text, sel->text, sizeof text);

                match(text);
                break;
        case XK_Right:
                match(text);
                break;
        case XK_Right:


@@ -221,9 +222,9 @@ kpress(XKeyEvent * e) {
                if(num && !iscntrl((int) buf[0])) {
                        buf[num] = 0;
                        if(len > 0)
                if(num && !iscntrl((int) buf[0])) {
                        buf[num] = 0;
                        if(len > 0)

-                               strncat(text, buf, sizeof(text));
+                               strncat(text, buf, sizeof text);

                        else
                        else

-                               strncpy(text, buf, sizeof(text));
+                               strncpy(text, buf, sizeof text);

                        match(text);
                }
        }
                        match(text);
                }
        }


@@ -238,7 +239,7 @@ readstdin(void) {
        Item *i, *new;
 
        i = 0;
        Item *i, *new;
 
        i = 0;

-       while(fgets(buf, sizeof(buf), stdin)) {
+       while(fgets(buf, sizeof buf, stdin)) {

                len = strlen(buf);
                if (buf[len - 1] == '\n')
                        buf[len - 1] = 0;
                len = strlen(buf);
                if (buf[len - 1] == '\n')
                        buf[len - 1] = 0;


@@ -309,6 +310,7 @@ main(int argc, char *argv[]) {
                }
                else
                        eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
                }
                else
                        eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);

+       setlocale(LC_CTYPE, "");

        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dmenu: cannot open display\n");
        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dmenu: cannot open display\n");