koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 32bit visual only when needed. Thus we could drop the --enable-32bit-visual option.

Browse Source
This commit is contained in:
darkraven
2012-03-01 13:53:06 +08:00
committed by Michael Stapelberg
parent 95f510e724
commit 9d68d780e2
9 changed files with 104 additions and 62 deletions

33
src/main.c

@ -253,7 +253,6 @@ int main(int argc, char *argv[]) {
bool delete_layout_path = false;
bool force_xinerama = false;
bool disable_signalhandler = false;
bool enable_32bit_visual = false;
static struct option long_options[] = {
{"no-autostart", no_argument, 0, 'a'},
{"config", required_argument, 0, 'c'},
@ -268,8 +267,6 @@ int main(int argc, char *argv[]) {
{"shmlog_size", required_argument, 0, 0},
{"get-socketpath", no_argument, 0, 0},
{"get_socketpath", no_argument, 0, 0},
{"enable-32bit-visual", no_argument, 0, 0},
{"enable_32bit_visual", no_argument, 0, 0},
{0, 0, 0, 0}
};
int option_index = 0, opt;
@ -371,11 +368,6 @@ int main(int argc, char *argv[]) {
layout_path = sstrdup(optarg);
delete_layout_path = true;
break;
} else if (strcmp(long_options[option_index].name, "enable_32bit_visual") == 0 ||
strcmp(long_options[option_index].name, "enable-32bit-visual") == 0) {
LOG("Enabling 32 bit visual (if available)\n");
enable_32bit_visual = true;
break;
}
/* fall-through */
default:
@ -402,10 +394,6 @@ int main(int argc, char *argv[]) {
"\tto 0 disables SHM logging entirely.\n"
"\tThe default is %d bytes.\n", shmlog_size);
fprintf(stderr, "\n");
fprintf(stderr, "\t--enable-32bit-visual\n"
"\tMakes i3 use a 32 bit visual, if available. Necessary for\n"
"\tpseudo-transparency with xcompmgr.\n");
fprintf(stderr, "\n");
fprintf(stderr, "If you pass plain text arguments, i3 will interpret them as a command\n"
"to send to a currently running i3 (like i3-msg). This allows you to\n"
"use nice and logical commands, such as:\n"
@ -525,27 +513,6 @@ int main(int argc, char *argv[]) {
visual_id = root_screen->root_visual;
colormap = root_screen->default_colormap;
if (enable_32bit_visual) {
xcb_depth_iterator_t depth_iter;
xcb_visualtype_iterator_t visual_iter;
for (depth_iter = xcb_screen_allowed_depths_iterator(root_screen);
depth_iter.rem;
xcb_depth_next(&depth_iter)) {
if (depth_iter.data->depth != 32)
continue;
visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
if (!visual_iter.rem)
continue;
visual_id = visual_iter.data->visual_id;
root_depth = depth_iter.data->depth;
colormap = xcb_generate_id(conn);
colormap_cookie = xcb_create_colormap_checked(conn, XCB_COLORMAP_ALLOC_NONE, colormap, root, visual_id);
DLOG("Found a visual with 32 bit depth.\n");
break;
}
}
DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);