* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* i3-config-wizard: Program to convert configs using keycodes to configs using
* keysyms.
*
*/
+#include <config.h>
+
#if defined(__FreeBSD__)
#include <sys/param.h>
#endif
#include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-x11.h>
+#define SN_API_NOT_YET_FROZEN 1
+#include <libsn/sn-launchee.h>
+
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/XKBlib.h>
#error "SYSCONFDIR not defined"
#endif
-#define FREE(pointer) \
- do { \
- if (pointer != NULL) { \
- free(pointer); \
- pointer = NULL; \
- } \
+#define FREE(pointer) \
+ do { \
+ free(pointer); \
+ pointer = NULL; \
} while (0)
#include "xcb.h"
#include "libi3.h"
+#define TEXT_PADDING logical_px(4)
+#define WIN_POS_X logical_px(490)
+#define WIN_POS_Y logical_px(297)
+#define WIN_WIDTH logical_px(300)
+#define WIN_HEIGHT (15 * font.height + TEXT_PADDING)
+
+#define col_x(col) \
+ (((col)-1) * char_width + TEXT_PADDING)
+#define row_y(row) \
+ (((row)-1) * font.height + TEXT_PADDING)
+
enum { STEP_WELCOME,
STEP_GENERATE } current_step = STEP_WELCOME;
enum { MOD_Mod1,
static xcb_get_modifier_mapping_reply_t *modmap_reply;
static i3Font font;
static i3Font bold_font;
-static char *socket_path;
+static int char_width;
+static char *socket_path = NULL;
static xcb_window_t win;
-static xcb_pixmap_t pixmap;
-static xcb_gcontext_t pixmap_gc;
+static surface_t surface;
static xcb_key_symbols_t *symbols;
xcb_window_t root;
static struct xkb_keymap *xkb_keymap;
static uint8_t xkb_base_event;
static uint8_t xkb_base_error;
-static void finish();
+static void finish(void);
#include "GENERATED_config_enums.h"
static void clear_stack(void) {
for (int c = 0; c < 10; c++) {
- if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
+ if (stack[c].type == STACK_STR)
free(stack[c].val.str);
stack[c].identifier = NULL;
stack[c].val.str = NULL;
}
sasprintf(&res, "bindsym %s%s%s %s%s\n", (modifiers == NULL ? "" : modrep), (modifiers == NULL ? "" : "+"), str, (release == NULL ? "" : release), get_string("command"));
clear_stack();
+ free(modrep);
return res;
}
}
}
if (walk != beginning) {
- char *str = scalloc(walk - beginning + 1);
+ char *str = scalloc(walk - beginning + 1, 1);
/* We copy manually to handle escaping of characters. */
int inpos, outpos;
for (inpos = 0, outpos = 0;
void debuglog(char *fmt, ...) {
}
-/*
- * This function resolves ~ in pathnames.
- * It may resolve wildcards in the first part of the path, but if no match
- * or multiple matches are found, it just returns a copy of path as given.
- *
- */
-static char *resolve_tilde(const char *path) {
- static glob_t globbuf;
- char *head, *tail, *result;
-
- tail = strchr(path, '/');
- head = strndup(path, tail ? (size_t)(tail - path) : strlen(path));
-
- int res = glob(head, GLOB_TILDE, NULL, &globbuf);
- free(head);
- /* no match, or many wildcard matches are bad */
- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
- result = strdup(path);
- else if (res != 0) {
- err(1, "glob() failed");
- } else {
- head = globbuf.gl_pathv[0];
- result = calloc(1, strlen(head) + (tail ? strlen(tail) : 0) + 1);
- strncpy(result, head, strlen(head));
- if (tail)
- strncat(result, tail, strlen(tail));
- }
- globfree(&globbuf);
-
- return result;
+static void txt(int col, int row, char *text, color_t fg, color_t bg) {
+ int x = col_x(col);
+ int y = row_y(row);
+ i3String *string = i3string_from_utf8(text);
+ draw_util_text(string, &surface, fg, bg, x, y, WIN_WIDTH - x - TEXT_PADDING);
+ i3string_free(string);
}
/*
* Handles expose events, that is, draws the window contents.
*
*/
-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_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border);
+static int handle_expose(void) {
+ const color_t black = draw_util_hex_to_color("#000000");
+ const color_t white = draw_util_hex_to_color("#FFFFFF");
+ const color_t green = draw_util_hex_to_color("#00FF00");
+ const color_t red = draw_util_hex_to_color("#FF0000");
- set_font(&font);
+ /* draw background */
+ draw_util_clear_surface(&surface, black);
-#define txt(x, row, text) \
- draw_text_ascii(text, pixmap, pixmap_gc, \
- x, (row - 1) * font.height + 4, 300 - x * 2)
+ set_font(&font);
if (current_step == STEP_WELCOME) {
- /* restore font color */
- set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
+ txt(2, 2, "You have not configured i3 yet.", white, black);
+ txt(2, 3, "Do you want me to generate a config at", white, black);
+
+ char *msg;
+ sasprintf(&msg, "%s?", config_path);
+ txt(2, 4, msg, white, black);
+ free(msg);
- 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(13, 6, "Yes, generate the config", white, black);
+ txt(13, 8, "No, I will use the defaults", white, black);
- /* green */
- set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000"));
- txt(25, 5, "<Enter>");
+ txt(4, 6, "<Enter>", green, black);
- /* red */
- set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000"));
- txt(31, 7, "<ESC>");
+ txt(5, 8, "<ESC>", red, black);
}
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(2, 2, "Please choose either:", white, black);
+ txt(13, 4, "Win as default modifier", white, black);
+ txt(13, 5, "Alt as default modifier", white, black);
+ txt(2, 7, "Afterwards, press", white, black);
+ txt(13, 9, "to write the config", white, black);
+ txt(13, 10, "to abort", white, black);
/* the not-selected modifier */
if (modifier == MOD_Mod4)
- txt(31, 5, "<Alt>");
+ txt(5, 5, "<Alt>", white, black);
else
- txt(31, 4, "<Win>");
+ txt(5, 4, "<Win>", white, black);
/* 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, "-> <Win>");
+ txt(2, 4, "-> <Win>", white, black);
else
- txt(10, 5, "-> <Alt>");
+ txt(2, 5, "-> <Alt>", white, black);
- /* green */
set_font(&font);
- set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000"));
- txt(25, 9, "<Enter>");
+ txt(4, 9, "<Enter>", green, black);
- /* red */
- set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000"));
- txt(31, 10, "<ESC>");
+ txt(5, 10, "<ESC>", red, black);
}
- /* 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_flush(conn);
return 1;
finish();
}
+ /* Swap between modifiers when up or down is pressed. */
+ if (sym == XK_Up || sym == XK_Down) {
+ modifier = (modifier == MOD_Mod1) ? MOD_Mod4 : MOD_Mod1;
+ handle_expose();
+ }
+
/* cancel any time */
if (sym == XK_Escape)
exit(0);
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 < col_x(5) || event->event_x > col_x(10))
+ return;
+
+ if (event->event_y >= row_y(4) && event->event_y <= (row_y(4) + font.height)) {
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_y >= row_y(5) && event->event_y <= (row_y(5) + font.height)) {
modifier = MOD_Mod1;
handle_expose();
}
-
- return;
}
/*
* Creates the config file and tells i3 to reload.
*
*/
-static void finish() {
+static void finish(void) {
printf("creating \"%s\"...\n", config_path);
struct xkb_context *xkb_context;
}
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 *xdg_config_home;
+ char *pattern = "pango:monospace 8";
+ char *patternbold = "pango:monospace bold 8";
int o, option_index = 0;
+ bool headless_run = false;
static struct option long_options[] = {
{"socket", required_argument, 0, 's'},
{"version", no_argument, 0, 'v'},
+ {"modifier", required_argument, 0, 'm'},
{"limit", required_argument, 0, 'l'},
{"prompt", required_argument, 0, 'P'},
{"prefix", required_argument, 0, 'p'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}};
- char *options_string = "s:vh";
+ char *options_string = "sm:vh";
while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) {
switch (o) {
case 's':
FREE(socket_path);
- socket_path = strdup(optarg);
+ socket_path = sstrdup(optarg);
break;
case 'v':
printf("i3-config-wizard " I3_VERSION "\n");
return 0;
+ case 'm':
+ headless_run = true;
+ if (strcmp(optarg, "alt") == 0)
+ modifier = MOD_Mod1;
+ else if (strcmp(optarg, "win") == 0)
+ modifier = MOD_Mod4;
+ else
+ err(EXIT_FAILURE, "Invalid modifier key %s", optarg);
+ break;
case 'h':
printf("i3-config-wizard " I3_VERSION "\n");
- printf("i3-config-wizard [-s <socket>] [-v]\n");
+ printf("i3-config-wizard [-s <socket>] [-m win|alt] [-v] [-h]\n");
return 0;
}
}
- /* Check if the destination config file does not exist but the path is
- * writable. If not, exit now, this program is not useful in that case. */
- struct stat stbuf;
- if (stat(config_path, &stbuf) == 0) {
- printf("The config file \"%s\" already exists. Exiting.\n", config_path);
+ char *path = get_config_path(NULL, false);
+ if (path != NULL) {
+ printf("The config file \"%s\" already exists. Exiting.\n", path);
+ free(path);
return 0;
}
- /* Create ~/.i3 if it does not yet exist */
- char *config_dir = resolve_tilde("~/.i3");
+ /* Always write to $XDG_CONFIG_HOME/i3/config by default. */
+ if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL)
+ xdg_config_home = "~/.config";
+
+ xdg_config_home = resolve_tilde(xdg_config_home);
+ sasprintf(&config_path, "%s/i3/config", xdg_config_home);
+
+ /* Create $XDG_CONFIG_HOME/i3 if it does not yet exist */
+ char *config_dir;
+ struct stat stbuf;
+ sasprintf(&config_dir, "%s/i3", xdg_config_home);
if (stat(config_dir, &stbuf) != 0)
- if (mkdir(config_dir, 0755) == -1)
- err(1, "mkdir(%s) failed", config_dir);
+ if (mkdirp(config_dir, DEFAULT_DIR_MODE) != 0)
+ err(EXIT_FAILURE, "mkdirp(%s) failed", config_dir);
free(config_dir);
+ free(xdg_config_home);
int fd;
if ((fd = open(config_path, O_CREAT | O_RDWR, 0644)) == -1) {
&xkb_base_error) != 1)
errx(EXIT_FAILURE, "Could not setup XKB extension.");
- if (socket_path == NULL)
- socket_path = root_atom_contents("I3_SOCKET_PATH", conn, screen);
-
- if (socket_path == NULL)
- socket_path = "/tmp/i3-ipc.sock";
-
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);
+ if (headless_run) {
+ finish();
+ return 0;
+ }
+
/* 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
+ /* Init startup notification. */
+ SnDisplay *sndisplay = sn_xcb_display_new(conn, NULL, NULL);
+ SnLauncheeContext *sncontext = sn_launchee_context_new_from_environment(sndisplay, screen);
+ sn_display_unref(sndisplay);
+
root_screen = xcb_aux_get_screen(conn, screen);
root = root_screen->root;
xcb_numlock_mask = get_mod_mask_for(XCB_NUM_LOCK, symbols, modmap_reply);
+ init_dpi();
font = load_font(pattern, true);
bold_font = load_font(patternbold, true);
+ /* Determine character width in the default font. */
+ set_font(&font);
+ char_width = predict_text_width(i3string_from_utf8("a"));
+
/* Open an input window */
win = xcb_generate_id(conn);
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 */
+ WIN_POS_X, WIN_POS_Y, WIN_WIDTH, WIN_HEIGHT, /* 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,
0, /* back pixel: black */
XCB_EVENT_MASK_EXPOSURE |
XCB_EVENT_MASK_BUTTON_PRESS});
+ if (sncontext) {
+ sn_launchee_context_setup_window(sncontext, win);
+ }
/* Map the window (make it visible) */
xcb_map_window(conn, win);
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_gc(conn, pixmap_gc, pixmap, 0, 0);
+ /* Initialize drawable surface */
+ draw_util_surface_init(conn, &surface, win, get_visualtype(root_screen), WIN_WIDTH, WIN_HEIGHT);
/* Grab the keyboard to get all input */
xcb_flush(conn);
exit(-1);
}
+ /* Startup complete. */
+ if (sncontext) {
+ sn_launchee_context_complete(sncontext);
+ sn_launchee_context_unref(sncontext);
+ }
+
xcb_flush(conn);
xcb_generic_event_t *event;
/* Strip off the highest bit (set if the event is generated) */
int type = (event->response_type & 0x7F);
+ /* TODO: handle mappingnotify */
switch (type) {
case XCB_KEY_PRESS:
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);
break;
case XCB_EXPOSE:
- handle_expose();
+ if (((xcb_expose_event_t *)event)->count == 0) {
+ handle_expose();
+ }
+
break;
}
free(event);
}
+ /* Dismiss drawable surface */
+ draw_util_surface_free(conn, &surface);
+
return 0;
}
projects / i3 / i3 / blobdiff