X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-config-wizard%2Fmain.c;h=f052d6d570e69a601d31e449b1da29aa5591b348;hb=ad31b13cb66f65431189f0ade323b9634cc26e8c;hp=be042673f2c53a02a1bbe8855fa13f38ced2b9c0;hpb=d4523de6c8f7d930d52ce69d94ff186a29c5e803;p=i3%2Fi3 diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c index be042673..f052d6d5 100644 --- a/i3-config-wizard/main.c +++ b/i3-config-wizard/main.c @@ -13,7 +13,7 @@ #endif /* For systems without getline, fall back to fgetln */ -#if defined(__APPLE__) || (defined(__FreeBSD__) && __FreeBSD_version < 800000) || defined(__OpenBSD__) +#if defined(__APPLE__) #define USE_FGETLN #elif defined(__FreeBSD__) /* Defining this macro before including stdio.h is necessary in order to have @@ -21,7 +21,6 @@ #define _WITH_GETLINE #endif -#include #include #include #include @@ -37,14 +36,19 @@ #include #include #include +#include #include #include #include #include +#include +#include + #include #include +#include /* We need SYSCONFDIR for the path to the keycode config template, so raise an * error if it’s not defined for whatever reason */ @@ -52,23 +56,27 @@ #error "SYSCONFDIR not defined" #endif -#define FREE(pointer) do { \ - if (pointer != NULL) { \ - free(pointer); \ - pointer = NULL; \ - } \ -} \ -while (0) +#define FREE(pointer) \ + do { \ + if (pointer != NULL) { \ + free(pointer); \ + pointer = NULL; \ + } \ + } while (0) #include "xcb.h" #include "libi3.h" -enum { STEP_WELCOME, STEP_GENERATE } current_step = STEP_WELCOME; -enum { MOD_Mod1, MOD_Mod4 } modifier = MOD_Mod4; +enum { STEP_WELCOME, + STEP_GENERATE } current_step = STEP_WELCOME; +enum { MOD_Mod1, + MOD_Mod4 } modifier = MOD_Mod4; static char *config_path; static uint32_t xcb_numlock_mask; xcb_connection_t *conn; +static xcb_key_symbols_t *keysyms; +xcb_screen_t *root_screen; static xcb_get_modifier_mapping_reply_t *modmap_reply; static i3Font font; static i3Font bold_font; @@ -78,11 +86,375 @@ static xcb_pixmap_t pixmap; static xcb_gcontext_t pixmap_gc; static xcb_key_symbols_t *symbols; xcb_window_t root; -Display *dpy; +static struct xkb_keymap *xkb_keymap; +static uint8_t xkb_base_event; +static uint8_t xkb_base_error; -char *rewrite_binding(const char *bindingline); static void finish(); +#include "GENERATED_config_enums.h" + +typedef struct token { + char *name; + char *identifier; + /* This might be __CALL */ + cmdp_state next_state; + union { + uint16_t call_identifier; + } extra; +} cmdp_token; + +typedef struct tokenptr { + cmdp_token *array; + int n; +} cmdp_token_ptr; + +#include "GENERATED_config_tokens.h" + +static cmdp_state state; +/* A list which contains the states that lead to the current state, e.g. + * INITIAL, WORKSPACE_LAYOUT. + * When jumping back to INITIAL, statelist_idx will simply be set to 1 + * (likewise for other states, e.g. MODE or BAR). + * This list is used to process the nearest error token. */ +static cmdp_state statelist[10] = {INITIAL}; +/* NB: statelist_idx points to where the next entry will be inserted */ +static int statelist_idx = 1; + +struct stack_entry { + /* Just a pointer, not dynamically allocated. */ + const char *identifier; + enum { + STACK_STR = 0, + STACK_LONG = 1, + } type; + union { + char *str; + long num; + } val; +}; + +/* 10 entries should be enough for everybody. */ +static struct stack_entry stack[10]; + +/* + * Pushes a string (identified by 'identifier') on the stack. We simply use a + * single array, since the number of entries we have to store is very small. + * + */ +static void push_string(const char *identifier, const char *str) { + for (int c = 0; c < 10; c++) { + if (stack[c].identifier != NULL && + strcmp(stack[c].identifier, identifier) != 0) + continue; + if (stack[c].identifier == NULL) { + /* Found a free slot, let’s store it here. */ + stack[c].identifier = identifier; + stack[c].val.str = sstrdup(str); + stack[c].type = STACK_STR; + } else { + /* Append the value. */ + char *prev = stack[c].val.str; + sasprintf(&(stack[c].val.str), "%s,%s", prev, str); + free(prev); + } + return; + } + + /* When we arrive here, the stack is full. This should not happen and + * means there’s either a bug in this parser or the specification + * contains a command with more than 10 identified tokens. */ + fprintf(stderr, "BUG: commands_parser stack full. This means either a bug " + "in the code, or a new command which contains more than " + "10 identified tokens.\n"); + exit(1); +} + +static void push_long(const char *identifier, long num) { + for (int c = 0; c < 10; c++) { + if (stack[c].identifier != NULL) + continue; + /* Found a free slot, let’s store it here. */ + stack[c].identifier = identifier; + stack[c].val.num = num; + stack[c].type = STACK_LONG; + return; + } + + /* When we arrive here, the stack is full. This should not happen and + * means there’s either a bug in this parser or the specification + * contains a command with more than 10 identified tokens. */ + fprintf(stderr, "BUG: commands_parser stack full. This means either a bug " + "in the code, or a new command which contains more than " + "10 identified tokens.\n"); + exit(1); +} + +static const char *get_string(const char *identifier) { + for (int c = 0; c < 10; c++) { + if (stack[c].identifier == NULL) + break; + if (strcmp(identifier, stack[c].identifier) == 0) + return stack[c].val.str; + } + return NULL; +} + +static void clear_stack(void) { + for (int c = 0; c < 10; c++) { + if (stack[c].type == STACK_STR && stack[c].val.str != NULL) + free(stack[c].val.str); + stack[c].identifier = NULL; + stack[c].val.str = NULL; + stack[c].val.num = 0; + } +} + +/* + * Returns true if sym is bound to any key except for 'except_keycode' on the + * first four layers (normal, shift, mode_switch, mode_switch + shift). + * + */ +static bool keysym_used_on_other_key(KeySym sym, xcb_keycode_t except_keycode) { + xcb_keycode_t i, + min_keycode = xcb_get_setup(conn)->min_keycode, + max_keycode = xcb_get_setup(conn)->max_keycode; + + for (i = min_keycode; i && i <= max_keycode; i++) { + if (i == except_keycode) + continue; + for (int level = 0; level < 4; level++) { + if (xcb_key_symbols_get_keysym(keysyms, i, level) != sym) + continue; + return true; + } + } + return false; +} + +static char *next_state(const cmdp_token *token) { + cmdp_state _next_state = token->next_state; + + if (token->next_state == __CALL) { + const char *modifiers = get_string("modifiers"); + int keycode = atoi(get_string("key")); + int level = 0; + if (modifiers != NULL && + strstr(modifiers, "Shift") != NULL) { + /* When shift is included, we really need to use the second-level + * symbol (upper-case). The lower-case symbol could be on a + * different key than the upper-case one (unlikely for letters, but + * more likely for special characters). */ + level = 1; + + /* Try to use the keysym on the first level (lower-case). In case + * this doesn’t make it ambiguous (think of a keyboard layout + * having '1' on two different keys, but '!' only on keycode 10), + * we’ll stick with the keysym of the first level. + * + * This reduces a lot of confusion for users who switch keyboard + * layouts from qwerty to qwertz or other slight variations of + * qwerty (yes, that happens quite often). */ + const xkb_keysym_t *syms; + int num = xkb_keymap_key_get_syms_by_level(xkb_keymap, keycode, 0, 0, &syms); + if (num == 0) + errx(1, "xkb_keymap_key_get_syms_by_level returned no symbols for keycode %d", keycode); + if (!keysym_used_on_other_key(syms[0], keycode)) + level = 0; + } + + const xkb_keysym_t *syms; + int num = xkb_keymap_key_get_syms_by_level(xkb_keymap, keycode, 0, level, &syms); + if (num == 0) + errx(1, "xkb_keymap_key_get_syms_by_level returned no symbols for keycode %d", keycode); + if (num > 1) + printf("xkb_keymap_key_get_syms_by_level (keycode = %d) returned %d symbolsinstead of 1, using only the first one.\n", keycode, num); + + char str[4096]; + if (xkb_keysym_get_name(syms[0], str, sizeof(str)) == -1) + errx(EXIT_FAILURE, "xkb_keysym_get_name(%u) failed", syms[0]); + const char *release = get_string("release"); + char *res; + char *modrep = (modifiers == NULL ? sstrdup("") : sstrdup(modifiers)); + char *comma; + while ((comma = strchr(modrep, ',')) != NULL) { + *comma = '+'; + } + sasprintf(&res, "bindsym %s%s%s %s%s\n", (modifiers == NULL ? "" : modrep), (modifiers == NULL ? "" : "+"), str, (release == NULL ? "" : release), get_string("command")); + clear_stack(); + return res; + } + + state = _next_state; + + /* See if we are jumping back to a state in which we were in previously + * (statelist contains INITIAL) and just move statelist_idx accordingly. */ + for (int i = 0; i < statelist_idx; i++) { + if (statelist[i] != _next_state) + continue; + statelist_idx = i + 1; + return NULL; + } + + /* Otherwise, the state is new and we add it to the list */ + statelist[statelist_idx++] = _next_state; + return NULL; +} + +static char *rewrite_binding(const char *input) { + state = INITIAL; + statelist_idx = 1; + + const char *walk = input; + const size_t len = strlen(input); + int c; + const cmdp_token *token; + char *result = NULL; + + /* The "<=" operator is intentional: We also handle the terminating 0-byte + * explicitly by looking for an 'end' token. */ + while ((size_t)(walk - input) <= len) { + /* Skip whitespace before every token, newlines are relevant since they + * separate configuration directives. */ + while ((*walk == ' ' || *walk == '\t') && *walk != '\0') + walk++; + + //printf("remaining input: %s\n", walk); + + cmdp_token_ptr *ptr = &(tokens[state]); + for (c = 0; c < ptr->n; c++) { + token = &(ptr->array[c]); + + /* A literal. */ + if (token->name[0] == '\'') { + if (strncasecmp(walk, token->name + 1, strlen(token->name) - 1) == 0) { + if (token->identifier != NULL) + push_string(token->identifier, token->name + 1); + walk += strlen(token->name) - 1; + if ((result = next_state(token)) != NULL) + return result; + break; + } + continue; + } + + if (strcmp(token->name, "number") == 0) { + /* Handle numbers. We only accept decimal numbers for now. */ + char *end = NULL; + errno = 0; + long int num = strtol(walk, &end, 10); + if ((errno == ERANGE && (num == LONG_MIN || num == LONG_MAX)) || + (errno != 0 && num == 0)) + continue; + + /* No valid numbers found */ + if (end == walk) + continue; + + if (token->identifier != NULL) + push_long(token->identifier, num); + + /* Set walk to the first non-number character */ + walk = end; + if ((result = next_state(token)) != NULL) + return result; + break; + } + + if (strcmp(token->name, "string") == 0 || + strcmp(token->name, "word") == 0) { + const char *beginning = walk; + /* Handle quoted strings (or words). */ + if (*walk == '"') { + beginning++; + walk++; + while (*walk != '\0' && (*walk != '"' || *(walk - 1) == '\\')) + walk++; + } else { + if (token->name[0] == 's') { + while (*walk != '\0' && *walk != '\r' && *walk != '\n') + walk++; + } else { + /* For a word, the delimiters are white space (' ' or + * '\t'), closing square bracket (]), comma (,) and + * semicolon (;). */ + while (*walk != ' ' && *walk != '\t' && + *walk != ']' && *walk != ',' && + *walk != ';' && *walk != '\r' && + *walk != '\n' && *walk != '\0') + walk++; + } + } + if (walk != beginning) { + char *str = scalloc(walk - beginning + 1); + /* We copy manually to handle escaping of characters. */ + int inpos, outpos; + for (inpos = 0, outpos = 0; + inpos < (walk - beginning); + inpos++, outpos++) { + /* We only handle escaped double quotes to not break + * backwards compatibility with people using \w in + * regular expressions etc. */ + if (beginning[inpos] == '\\' && beginning[inpos + 1] == '"') + inpos++; + str[outpos] = beginning[inpos]; + } + if (token->identifier) + push_string(token->identifier, str); + free(str); + /* If we are at the end of a quoted string, skip the ending + * double quote. */ + if (*walk == '"') + walk++; + if ((result = next_state(token)) != NULL) + return result; + break; + } + } + + if (strcmp(token->name, "end") == 0) { + //printf("checking for end: *%s*\n", walk); + if (*walk == '\0' || *walk == '\n' || *walk == '\r') { + if ((result = next_state(token)) != NULL) + return result; + /* To make sure we start with an appropriate matching + * datastructure for commands which do *not* specify any + * criteria, we re-initialize the criteria system after + * every command. */ + // TODO: make this testable + walk++; + break; + } + } + } + } + + return NULL; +} + +/* + * Having verboselog(), errorlog() and debuglog() is necessary when using libi3. + * + */ +void verboselog(char *fmt, ...) { + va_list args; + + va_start(args, fmt); + vfprintf(stdout, fmt, args); + va_end(args); +} + +void errorlog(char *fmt, ...) { + va_list args; + + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); +} + +void debuglog(char *fmt, ...) { +} + /* * This function resolves ~ in pathnames. * It may resolve wildcards in the first part of the path, but if no match @@ -94,7 +466,7 @@ static char *resolve_tilde(const char *path) { char *head, *tail, *result; tail = strchr(path, '/'); - head = strndup(path, tail ? tail - path : strlen(path)); + head = strndup(path, tail ? (size_t)(tail - path) : strlen(path)); int res = glob(head, GLOB_TILDE, NULL, &globbuf); free(head); @@ -121,68 +493,70 @@ static char *resolve_tilde(const char *path) { */ static int handle_expose() { /* re-draw the background */ - xcb_rectangle_t border = {0, 0, 300, (15 * font.height) + 8}; - xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){ get_colorpixel("#000000") }); + xcb_rectangle_t border = {0, 0, logical_px(300), (logical_px(15) * font.height) + logical_px(8)}; + xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){get_colorpixel("#000000")}); xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border); set_font(&font); -#define txt(x, row, text) \ - draw_text(text, strlen(text), false, pixmap, pixmap_gc,\ - x, (row - 1) * font.height + 4, 300 - x * 2) +#define txt(x, row, text) \ + draw_text_ascii(text, pixmap, pixmap_gc, \ + x, (row - 1) * font.height + logical_px(4), logical_px(500) - x * 2) if (current_step == STEP_WELCOME) { /* restore font color */ set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); - txt(10, 2, "You have not configured i3 yet."); - txt(10, 3, "Do you want me to generate ~/.i3/config?"); - txt(85, 5, "Yes, generate ~/.i3/config"); - txt(85, 7, "No, I will use the defaults"); + txt(logical_px(10), 2, "You have not configured i3 yet."); + txt(logical_px(10), 3, "Do you want me to generate ~/.i3/config?"); + txt(logical_px(85), 5, "Yes, generate ~/.i3/config"); + txt(logical_px(85), 7, "No, I will use the defaults"); /* green */ set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000")); - txt(25, 5, ""); + txt(logical_px(25), 5, ""); /* red */ set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000")); - txt(31, 7, ""); + txt(logical_px(31), 7, ""); } if (current_step == STEP_GENERATE) { set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); - txt(10, 2, "Please choose either:"); - txt(85, 4, "Win as default modifier"); - txt(85, 5, "Alt as default modifier"); - txt(10, 7, "Afterwards, press"); - txt(85, 9, "to write ~/.i3/config"); - txt(85, 10, "to abort"); + txt(logical_px(10), 2, "Please choose either:"); + txt(logical_px(85), 4, "Win as default modifier"); + txt(logical_px(85), 5, "Alt as default modifier"); + txt(logical_px(10), 7, "Afterwards, press"); + txt(logical_px(85), 9, "to write ~/.i3/config"); + txt(logical_px(85), 10, "to abort"); /* the not-selected modifier */ if (modifier == MOD_Mod4) - txt(31, 5, ""); - else txt(31, 4, ""); + txt(logical_px(31), 5, ""); + else + txt(logical_px(31), 4, ""); /* the selected modifier */ set_font(&bold_font); set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); if (modifier == MOD_Mod4) - txt(10, 4, "-> "); - else txt(10, 5, "-> "); + txt(logical_px(10), 4, "-> "); + else + txt(logical_px(10), 5, "-> "); /* green */ set_font(&font); set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000")); - txt(25, 9, ""); + txt(logical_px(25), 9, ""); /* red */ set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000")); - txt(31, 10, ""); + txt(logical_px(31), 10, ""); } /* Copy the contents of the pixmap to the real window */ - xcb_copy_area(conn, pixmap, win, pixmap_gc, 0, 0, 0, 0, /* */ 500, 500); + xcb_copy_area(conn, pixmap, win, pixmap_gc, 0, 0, 0, 0, logical_px(500), logical_px(500)); xcb_flush(conn); return 1; @@ -206,16 +580,16 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press current_step = STEP_GENERATE; /* Set window title */ xcb_change_property(conn, - XCB_PROP_MODE_REPLACE, - win, - A__NET_WM_NAME, - A_UTF8_STRING, - 8, - strlen("i3: generate config"), - "i3: generate config"); + XCB_PROP_MODE_REPLACE, + win, + A__NET_WM_NAME, + A_UTF8_STRING, + 8, + strlen("i3: generate config"), + "i3: generate config"); xcb_flush(conn); - } - else finish(); + } else + finish(); } /* cancel any time */ @@ -259,18 +633,18 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press * Handle button presses to make clicking on "" and "" work * */ -static void handle_button_press(xcb_button_press_event_t* event) { +static void handle_button_press(xcb_button_press_event_t *event) { if (current_step != STEP_GENERATE) return; - if (event->event_x >= 32 && event->event_x <= 68 && - event->event_y >= 45 && event->event_y <= 54) { + if (event->event_x >= logical_px(32) && event->event_x <= logical_px(68) && + event->event_y >= logical_px(45) && event->event_y <= logical_px(54)) { modifier = MOD_Mod4; handle_expose(); } - if (event->event_x >= 32 && event->event_x <= 68 && - event->event_y >= 56 && event->event_y <= 70) { + if (event->event_x >= logical_px(32) && event->event_x <= logical_px(68) && + event->event_y >= logical_px(56) && event->event_y <= logical_px(70)) { modifier = MOD_Mod1; handle_expose(); } @@ -285,8 +659,14 @@ static void handle_button_press(xcb_button_press_event_t* event) { static void finish() { printf("creating \"%s\"...\n", config_path); - if (!(dpy = XOpenDisplay(NULL))) - errx(1, "Could not connect to X11"); + struct xkb_context *xkb_context; + + if ((xkb_context = xkb_context_new(0)) == NULL) + errx(1, "could not create xkbcommon context"); + + int32_t device_id = xkb_x11_get_core_keyboard_device_id(conn); + if ((xkb_keymap = xkb_x11_keymap_new_from_device(xkb_context, conn, device_id, 0)) == NULL) + errx(1, "xkb_x11_keymap_new_from_device failed"); FILE *kc_config = fopen(SYSCONFDIR "/i3/config.keycodes", "r"); if (kc_config == NULL) @@ -308,7 +688,7 @@ static void finish() { fputs("# This file has been auto-generated by i3-config-wizard(1).\n", ks_config); fputs("# It will not be overwritten, so edit it as you like.\n", ks_config); fputs("#\n", ks_config); - fputs("# Should you change your keyboard layout somewhen, delete\n", ks_config); + fputs("# Should you change your keyboard layout some time, delete\n", ks_config); fputs("# this file and re-run i3-config-wizard(1).\n", ks_config); fputs("#\n", ks_config); @@ -342,7 +722,8 @@ static void finish() { if (strncmp(walk, "set $mod ", strlen("set $mod ")) == 0) { if (modifier == MOD_Mod1) fputs("set $mod Mod1\n", ks_config); - else fputs("set $mod Mod4\n", ks_config); + else + fputs("set $mod Mod4\n", ks_config); continue; } @@ -370,7 +751,7 @@ static void finish() { /* tell i3 to reload the config file */ int sockfd = ipc_connect(socket_path); - ipc_send_message(sockfd, strlen("reload"), 0, (uint8_t*)"reload"); + ipc_send_message(sockfd, strlen("reload"), 0, (uint8_t *)"reload"); close(sockfd); exit(0); @@ -379,8 +760,8 @@ static void finish() { int main(int argc, char *argv[]) { config_path = resolve_tilde("~/.i3/config"); socket_path = getenv("I3SOCK"); - char *pattern = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; - char *patternbold = "-misc-fixed-bold-r-normal--13-120-75-75-C-70-iso10646-1"; + char *pattern = "pango:monospace 8"; + char *patternbold = "pango:monospace bold 8"; int o, option_index = 0; static struct option long_options[] = { @@ -391,8 +772,7 @@ int main(int argc, char *argv[]) { {"prefix", required_argument, 0, 'p'}, {"font", required_argument, 0, 'f'}, {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; + {0, 0, 0, 0}}; char *options_string = "s:vh"; @@ -435,28 +815,39 @@ int main(int argc, char *argv[]) { close(fd); unlink(config_path); + int screen; + if ((conn = xcb_connect(NULL, &screen)) == NULL || + xcb_connection_has_error(conn)) + errx(1, "Cannot open display\n"); + + if (xkb_x11_setup_xkb_extension(conn, + XKB_X11_MIN_MAJOR_XKB_VERSION, + XKB_X11_MIN_MINOR_XKB_VERSION, + 0, + NULL, + NULL, + &xkb_base_event, + &xkb_base_error) != 1) + errx(EXIT_FAILURE, "Could not setup XKB extension."); + if (socket_path == NULL) - socket_path = root_atom_contents("I3_SOCKET_PATH"); + socket_path = root_atom_contents("I3_SOCKET_PATH", conn, screen); if (socket_path == NULL) socket_path = "/tmp/i3-ipc.sock"; - int screens; - if ((conn = xcb_connect(NULL, &screens)) == NULL || - xcb_connection_has_error(conn)) - errx(1, "Cannot open display\n"); - + keysyms = xcb_key_symbols_alloc(conn); xcb_get_modifier_mapping_cookie_t modmap_cookie; modmap_cookie = xcb_get_modifier_mapping(conn); symbols = xcb_key_symbols_alloc(conn); - /* Place requests for the atoms we need as soon as possible */ - #define xmacro(atom) \ - xcb_intern_atom_cookie_t atom ## _cookie = xcb_intern_atom(conn, 0, strlen(#atom), #atom); - #include "atoms.xmacro" - #undef xmacro +/* Place requests for the atoms we need as soon as possible */ +#define xmacro(atom) \ + xcb_intern_atom_cookie_t atom##_cookie = xcb_intern_atom(conn, 0, strlen(#atom), #atom); +#include "atoms.xmacro" +#undef xmacro - xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens); + root_screen = xcb_aux_get_screen(conn, screen); root = root_screen->root; if (!(modmap_reply = xcb_get_modifier_mapping_reply(conn, modmap_cookie, NULL))) @@ -472,59 +863,58 @@ int main(int argc, char *argv[]) { xcb_create_window( conn, XCB_COPY_FROM_PARENT, - win, /* the window id */ - root, /* parent == root */ - 490, 297, 300, 205, /* dimensions */ - 0, /* X11 border = 0, we draw our own */ + win, /* the window id */ + root, /* parent == root */ + logical_px(490), logical_px(297), logical_px(300), logical_px(205), /* dimensions */ + 0, /* X11 border = 0, we draw our own */ XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_COPY_FROM_PARENT, /* copy visual from parent */ XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, (uint32_t[]){ 0, /* back pixel: black */ XCB_EVENT_MASK_EXPOSURE | - XCB_EVENT_MASK_BUTTON_PRESS - }); + XCB_EVENT_MASK_BUTTON_PRESS}); /* Map the window (make it visible) */ xcb_map_window(conn, win); - /* Setup NetWM atoms */ - #define xmacro(name) \ - do { \ - xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name ## _cookie, NULL); \ - if (!reply) \ - errx(EXIT_FAILURE, "Could not get atom " # name "\n"); \ - \ - A_ ## name = reply->atom; \ - free(reply); \ - } while (0); - #include "atoms.xmacro" - #undef xmacro +/* Setup NetWM atoms */ +#define xmacro(name) \ + do { \ + xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name##_cookie, NULL); \ + if (!reply) \ + errx(EXIT_FAILURE, "Could not get atom " #name "\n"); \ + \ + A_##name = reply->atom; \ + free(reply); \ + } while (0); +#include "atoms.xmacro" +#undef xmacro /* Set dock mode */ xcb_change_property(conn, - XCB_PROP_MODE_REPLACE, - win, - A__NET_WM_WINDOW_TYPE, - A_ATOM, - 32, - 1, - (unsigned char*) &A__NET_WM_WINDOW_TYPE_DIALOG); + XCB_PROP_MODE_REPLACE, + win, + A__NET_WM_WINDOW_TYPE, + A_ATOM, + 32, + 1, + (unsigned char *)&A__NET_WM_WINDOW_TYPE_DIALOG); /* Set window title */ xcb_change_property(conn, - XCB_PROP_MODE_REPLACE, - win, - A__NET_WM_NAME, - A_UTF8_STRING, - 8, - strlen("i3: first configuration"), - "i3: first configuration"); + XCB_PROP_MODE_REPLACE, + win, + A__NET_WM_NAME, + A_UTF8_STRING, + 8, + strlen("i3: first configuration"), + "i3: first configuration"); /* Create pixmap */ pixmap = xcb_generate_id(conn); pixmap_gc = xcb_generate_id(conn); - xcb_create_pixmap(conn, root_screen->root_depth, pixmap, win, 500, 500); + xcb_create_pixmap(conn, root_screen->root_depth, pixmap, win, logical_px(500), logical_px(500)); xcb_create_gc(conn, pixmap_gc, pixmap, 0, 0); /* Grab the keyboard to get all input */ @@ -562,13 +952,13 @@ int main(int argc, char *argv[]) { switch (type) { case XCB_KEY_PRESS: - handle_key_press(NULL, conn, (xcb_key_press_event_t*)event); + handle_key_press(NULL, conn, (xcb_key_press_event_t *)event); break; /* TODO: handle mappingnotify */ case XCB_BUTTON_PRESS: - handle_button_press((xcb_button_press_event_t*)event); + handle_button_press((xcb_button_press_event_t *)event); break; case XCB_EXPOSE: