*
* i3 - an improved dynamic tiling window manager
*
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
*
* See file LICENSE for license information.
*
*/
#include <stdio.h>
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <xcb/xcb_property.h>
#include <xcb/xcb_keysyms.h>
#include <xcb/xcb_icccm.h>
-#include <xcb/xinerama.h>
#include <ev.h>
#include "table.h"
#include "util.h"
#include "xcb.h"
-#include "xinerama.h"
+#include "randr.h"
#include "manage.h"
#include "ipc.h"
#include "log.h"
+#include "sighandler.h"
xcb_connection_t *global_conn;
*
*/
static void xkb_got_event(EV_P_ struct ev_io *w, int revents) {
- LOG("got xkb event, yay\n");
+ DLOG("Handling XKB event\n");
XEvent ev;
/* When using xmodmap, every change (!) gets an own event.
* Therefore, we just read all events and only handle the
xcb_get_numlock_mask(global_conn);
ungrab_all_keys(global_conn);
- LOG("Re-grabbing...\n");
+ DLOG("Re-grabbing...\n");
grab_all_keys(global_conn);
- LOG("Done\n");
+ DLOG("Done\n");
}
int i, screens, opt;
char *override_configpath = NULL;
bool autostart = true;
+ bool only_check_config = false;
xcb_connection_t *conn;
xcb_property_handlers_t prophs;
xcb_intern_atom_cookie_t atom_cookies[NUM_ATOMS];
start_argv = argv;
- while ((opt = getopt_long(argc, argv, "c:vahld:V", long_options, &option_index)) != -1) {
+ while ((opt = getopt_long(argc, argv, "c:Cvahld:V", long_options, &option_index)) != -1) {
switch (opt) {
case 'a':
LOG("Autostart disabled using -a\n");
case 'c':
override_configpath = sstrdup(optarg);
break;
+ case 'C':
+ LOG("Checking configuration file only (-C)\n");
+ only_check_config = true;
+ break;
case 'v':
printf("i3 version " I3_VERSION " © 2009 Michael Stapelberg and contributors\n");
exit(EXIT_SUCCESS);
/* DEPRECATED, ignored for the next 3 versions (3.e, 3.f, 3.g) */
break;
default:
- fprintf(stderr, "Usage: %s [-c configfile] [-d loglevel] [-a] [-v] [-V]\n", argv[0]);
+ fprintf(stderr, "Usage: %s [-c configfile] [-d loglevel] [-a] [-v] [-V] [-C]\n", argv[0]);
fprintf(stderr, "\n");
fprintf(stderr, "-a: disable autostart\n");
fprintf(stderr, "-v: display version and exit\n");
fprintf(stderr, "-V: enable verbose mode\n");
fprintf(stderr, "-d <loglevel>: enable debug loglevel <loglevel>\n");
fprintf(stderr, "-c <configfile>: use the provided configfile instead\n");
+ fprintf(stderr, "-C: check configuration file and exit\n");
exit(EXIT_FAILURE);
}
}
die("Cannot open display\n");
load_configuration(conn, override_configpath, false);
+ if (only_check_config) {
+ LOG("Done checking configuration file. Exiting.\n");
+ exit(0);
+ }
/* Create the initial container on the first workspace. This used to
* be part of init_table, but since it possibly requires an X
REQUEST_ATOM(UTF8_STRING);
REQUEST_ATOM(WM_STATE);
REQUEST_ATOM(WM_CLIENT_LEADER);
+ REQUEST_ATOM(_NET_CURRENT_DESKTOP);
+ REQUEST_ATOM(_NET_ACTIVE_WINDOW);
+ REQUEST_ATOM(_NET_WORKAREA);
/* TODO: this has to be more beautiful somewhen */
int major, minor, error;
int evBase, errBase;
if ((xkbdpy = XkbOpenDisplay(getenv("DISPLAY"), &evBase, &errBase, &major, &minor, &error)) == NULL) {
- LOG("ERROR: XkbOpenDisplay() failed, disabling XKB support\n");
+ ELOG("ERROR: XkbOpenDisplay() failed, disabling XKB support\n");
xkb_supported = false;
}
}
/* Initialize event loop using libev */
- struct ev_loop *loop = ev_default_loop(0);
+ struct ev_loop *loop = ev_loop_new(0);
if (loop == NULL)
die("Could not initialize libev. Bad LIBEV_FLAGS?\n");
XCB_EVENT_MASK_POINTER_MOTION |
XCB_EVENT_MASK_PROPERTY_CHANGE |
XCB_EVENT_MASK_ENTER_WINDOW };
- xcb_change_window_attributes(conn, root, mask, values);
+ xcb_void_cookie_t cookie;
+ cookie = xcb_change_window_attributes_checked(conn, root, mask, values);
+ check_error(conn, cookie, "Another window manager seems to be running");
/* Setup NetWM atoms */
#define GET_ATOM(name) { \
xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, atom_cookies[name], NULL); \
if (!reply) { \
- LOG("Could not get atom " #name "\n"); \
+ ELOG("Could not get atom " #name "\n"); \
exit(-1); \
} \
atoms[name] = reply->atom; \
GET_ATOM(UTF8_STRING);
GET_ATOM(WM_STATE);
GET_ATOM(WM_CLIENT_LEADER);
+ GET_ATOM(_NET_CURRENT_DESKTOP);
+ GET_ATOM(_NET_ACTIVE_WINDOW);
+ GET_ATOM(_NET_WORKAREA);
xcb_property_set_handler(&prophs, atoms[_NET_WM_WINDOW_TYPE], UINT_MAX, handle_window_type, NULL);
/* TODO: In order to comply with EWMH, we have to watch _NET_WM_STRUT_PARTIAL */
}
}
- /* check for Xinerama */
- LOG("Checking for Xinerama...\n");
- initialize_xinerama(conn);
+ DLOG("Checking for XRandR...\n");
+ int randr_base;
+ initialize_randr(conn, &randr_base);
+
+ xcb_event_set_handler(&evenths,
+ randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY,
+ handle_screen_change,
+ NULL);
xcb_flush(conn);
/* Get pointer position to see on which screen we’re starting */
xcb_query_pointer_reply_t *reply;
if ((reply = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, root), NULL)) == NULL) {
- LOG("Could not get pointer position\n");
+ ELOG("Could not get pointer position\n");
return 1;
}
- i3Screen *screen = get_screen_containing(reply->root_x, reply->root_y);
+ Output *screen = get_screen_containing(reply->root_x, reply->root_y);
if (screen == NULL) {
- LOG("ERROR: No screen at %d x %d, starting on the first screen\n",
+ ELOG("ERROR: No screen at %d x %d, starting on the first screen\n",
reply->root_x, reply->root_y);
- screen = TAILQ_FIRST(virtual_screens);
+ screen = get_first_output();
}
- LOG("Starting on %d\n", screen->current_workspace);
+ DLOG("Starting on %p\n", screen->current_workspace);
c_ws = screen->current_workspace;
manage_existing_windows(conn, &prophs, root);
if (config.ipc_socket_path != NULL) {
int ipc_socket = ipc_create_socket(config.ipc_socket_path);
if (ipc_socket == -1) {
- LOG("Could not create the IPC socket, IPC disabled\n");
+ ELOG("Could not create the IPC socket, IPC disabled\n");
} else {
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, ipc_socket, EV_READ);
/* Handle the events which arrived until now */
xcb_check_cb(NULL, NULL, 0);
+ setup_signal_handler();
/* Ungrab the server to receive events and enter libev’s eventloop */
xcb_ungrab_server(conn);
ev_loop(loop, 0);