SMPFR

diff -rN old-evilwm/Makefile Zevilwm/Makefile
32a33,35
> # To use keys on azerty-fr keyboard, uncomment the following line:
> #DEFINES += -DAZERTYFR
>
diff -rN old-evilwm/events.c new-evilwm/events.c
53,55c53,57
< case XK_1: case XK_2: case XK_3: case XK_4:
< case XK_5: case XK_6: case XK_7: case XK_8:
< switch_vdesk(current_screen, KEY_TO_VDESK(key));
---
> case KEY_VDESK_1: case KEY_VDESK_2:
> case KEY_VDESK_3: case KEY_VDESK_4:
> case KEY_VDESK_5: case KEY_VDESK_6:
> case KEY_VDESK_7: case KEY_VDESK_8:
> switch_vdesk(current_screen, key_to_vdesk(key));
58c60
< if (current_screen->vdesk > KEY_TO_VDESK(XK_1)) {
---
> if (current_screen->vdesk > key_to_vdesk(KEY_VDESK_1)) {
64c66
< if (current_screen->vdesk < KEY_TO_VDESK(XK_8)) {
---
> if (current_screen->vdesk < key_to_vdesk(KEY_VDESK_8)) {
diff -rN old-evilwm/evilwm.h new-evilwm/evilwm.h
57,58c57
< #define KEY_TO_VDESK(key) ((key) - XK_1)
< #define valid_vdesk(v) ((unsigned)(v) #define valid_vdesk(v) ((unsigned)(v)
> #ifdef AZERTYFR
> #define KEY_VDESK_1 XK_ampersand
> #define KEY_VDESK_2 XK_eacute
> #define KEY_VDESK_3 XK_quotedbl
> #define KEY_VDESK_4 XK_apostrophe
> #define KEY_VDESK_5 XK_parenleft
> #define KEY_VDESK_6 XK_minus
> #define KEY_VDESK_7 XK_egrave
> #define KEY_VDESK_8 XK_underscore
> #else
> #define KEY_VDESK_1 XK_1
> #define KEY_VDESK_2 XK_2
> #define KEY_VDESK_3 XK_3
> #define KEY_VDESK_4 XK_4
> #define KEY_VDESK_5 XK_5
> #define KEY_VDESK_6 XK_6
> #define KEY_VDESK_7 XK_7
> #define KEY_VDESK_8 XK_8
> #endif
>
>
diff -rN old-evilwm/main.c Zevilwm/main.c
366c366
< screens.vdesk = KEY_TO_VDESK(XK_1);
---
> screens.vdesk = key_to_vdesk(KEY_VDESK_1);
diff -rN old-evilwm/screen.c new-evilwm/screen.c
25a26,46
> int key_to_vdesk(int key) {
> switch(key) {
> case KEY_VDESK_1:
> return 0;
> case KEY_VDESK_2:
> return 1;
> case KEY_VDESK_3:
> return 2;
> case KEY_VDESK_4:
> return 3;
> case KEY_VDESK_5:
> return 4;
> case KEY_VDESK_6:
> return 5;
> case KEY_VDESK_7:
> return 6;
> case KEY_VDESK_8:
> return 7;
> }
> }
>
469c490
< XK_1, XK_2, XK_3, XK_4, XK_5, XK_6, XK_7, XK_8,
---
> KEY_VDESK_1, KEY_VDESK_2, KEY_VDESK_3, KEY_VDESK_4, KEY_VDESK_5, KEY_VDESK_6, KEY_VDESK_7, KEY_VDESK_8,