Skip to content

There is a bug that appears when windows are created #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
semenkovk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

There is a bug that appears when windows are created #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions openbox/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ GList *client_list = NULL;
static GSList *client_destroy_notifies = NULL;
static RrImage *client_default_icon = NULL;

static void client_get_all(ObClient *self, gboolean real);
static int client_get_all(ObClient *self, gboolean real);
static void client_get_startup_id(ObClient *self);
static void client_get_session_ids(ObClient *self);
static void client_save_app_rule_values(ObClient *self);
static void client_get_area(ObClient *self);
static int client_get_area(ObClient *self);
static void client_get_desktop(ObClient *self);
static void client_get_state(ObClient *self);
static void client_get_shaped(ObClient *self);
Expand Down Expand Up @@ -244,7 +244,10 @@ void client_manage(Window window, ObPrompt *prompt)
self->desktop = screen_num_desktops; /* always an invalid value */

/* get all the stuff off the window */
client_get_all(self, TRUE);
if(client_get_all(self, TRUE) != 0){
grab_server(FALSE);
return;
}

ob_debug("Window type: %d", self->type);
ob_debug("Window group: 0x%x", self->group?self->group->leader:0);
Expand Down Expand Up @@ -1202,10 +1205,13 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
return ox != *x || oy != *y;
}

static void client_get_all(ObClient *self, gboolean real)
static int client_get_all(ObClient *self, gboolean real)
{
/* this is needed for the frame to set itself up */
client_get_area(self);
if( (client_get_area(self) != 0) && real){
grab_server(FALSE);
return 1;
}

/* these things can change the decor and functions of the window */

Expand All @@ -1230,7 +1236,7 @@ static void client_get_all(ObClient *self, gboolean real)
/* now we got everything that can affect the decorations or app rule
matching */
if (!real)
return;
return 0;

/* save the values of the variables used for app rule matching */
client_save_app_rule_values(self);
Expand Down Expand Up @@ -1263,6 +1269,7 @@ static void client_get_all(ObClient *self, gboolean real)
client_update_strut(self);
client_update_icons(self);
client_update_icon_geometry(self);
return 0;
}

static void client_get_startup_id(ObClient *self)
Expand All @@ -1273,20 +1280,24 @@ static void client_get_startup_id(ObClient *self)
&self->startup_id);
}

static void client_get_area(ObClient *self)
static int client_get_area(ObClient *self)
{
XWindowAttributes wattrib;
Status ret;

ret = XGetWindowAttributes(obt_display, self->window, &wattrib);
g_assert(ret != BadWindow);
if( ret == 0){
ob_debug("client_get_area: Can't get window attributes for 0x%lx", self->window);
return 1;
}

RECT_SET(self->area, wattrib.x, wattrib.y, wattrib.width, wattrib.height);
POINT_SET(self->root_pos, wattrib.x, wattrib.y);
self->border_width = wattrib.border_width;

ob_debug("client area: %d %d %d %d bw %d", wattrib.x, wattrib.y,
wattrib.width, wattrib.height, wattrib.border_width);
return 0;
}

static void client_get_desktop(ObClient *self)
Expand Down