nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Very inconsequential changes.

Browse source
This commit is contained in:
Mikael Magnusson 2008-02-28 20:57:33 +01:00
parent 017d956444
commit 323df7cbc2
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/frame.c
View file

@ -99,7 +99,7 @@ ObFrame *frame_new(ObClient *client)
mask = 0; mask = 0;
if (visual) { if (visual) {
/* client has a 32-bit visual */ /* client has a 32-bit visual */
mask |= CWColormap | CWBackPixel | CWBorderPixel; mask = CWColormap | CWBackPixel | CWBorderPixel;
/* create a colormap with the visual */ /* create a colormap with the visual */
self->colormap = attrib.colormap = self->colormap = attrib.colormap =
XCreateColormap(ob_display, XCreateColormap(ob_display,
@ -116,7 +116,7 @@ ObFrame *frame_new(ObClient *client)
mask = 0; mask = 0;
if (visual) { if (visual) {
/* client has a 32-bit visual */ /* client has a 32-bit visual */
mask |= CWColormap | CWBackPixel | CWBorderPixel; mask = CWColormap | CWBackPixel | CWBorderPixel;
attrib.colormap = RrColormap(ob_rr_inst); attrib.colormap = RrColormap(ob_rr_inst);
} }
@ -190,7 +190,7 @@ ObFrame *frame_new(ObClient *client)
set_theme_statics(self); set_theme_statics(self);
return (ObFrame*)self; return self;
} }
static void set_theme_statics(ObFrame *self) static void set_theme_statics(ObFrame *self)
@ -1154,7 +1154,7 @@ static void layout_title(ObFrame *self)
self->label_width = self->width - (ob_rr_theme->paddingx + 1) * 2; self->label_width = self->width - (ob_rr_theme->paddingx + 1) * 2;
self->leftmost = self->rightmost = OB_FRAME_CONTEXT_NONE; self->leftmost = self->rightmost = OB_FRAME_CONTEXT_NONE;
/* figure out what's being show, find each element's position, and the /* figure out what's being shown, find each element's position, and the
width of the label width of the label
do the ones before the label, then after the label, do the ones before the label, then after the label,

22
openbox/screen.c
View file

@ -56,20 +56,20 @@ static gboolean replace_wm(void);
static void screen_tell_ksplash(void); static void screen_tell_ksplash(void);
static void screen_fallback_focus(void); static void screen_fallback_focus(void);
guint screen_num_desktops; guint screen_num_desktops;
guint screen_num_monitors; guint screen_num_monitors;
guint screen_desktop; guint screen_desktop;
guint screen_last_desktop; guint screen_last_desktop;
gboolean screen_showing_desktop; gboolean screen_showing_desktop;
ObDesktopLayout screen_desktop_layout; ObDesktopLayout screen_desktop_layout;
gchar **screen_desktop_names; gchar **screen_desktop_names;
Window screen_support_win; Window screen_support_win;
Time screen_desktop_user_time = CurrentTime; Time screen_desktop_user_time = CurrentTime;
static Size screen_physical_size; static Size screen_physical_size;
static guint screen_old_desktop; static guint screen_old_desktop;
static gboolean screen_desktop_timeout = TRUE; static gboolean screen_desktop_timeout = TRUE;
/*! An array of desktops, holding array of areas per monitor */ /*! An array of desktops, holding an array of areas per monitor */
static Rect *monitor_area = NULL; static Rect *monitor_area = NULL;
/*! An array of desktops, holding an array of struts */ /*! An array of desktops, holding an array of struts */
static GSList *struts_top = NULL; static GSList *struts_top = NULL;
@ -340,7 +340,7 @@ static void screen_tell_ksplash(void)
e.xclient.display = ob_display; e.xclient.display = ob_display;
e.xclient.window = RootWindow(ob_display, ob_screen); e.xclient.window = RootWindow(ob_display, ob_screen);
e.xclient.message_type = e.xclient.message_type =
XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False ); XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False);
e.xclient.format = 8; e.xclient.format = 8;
strcpy(e.xclient.data.b, "wm started"); strcpy(e.xclient.data.b, "wm started");
XSendEvent(ob_display, RootWindow(ob_display, ob_screen), XSendEvent(ob_display, RootWindow(ob_display, ob_screen),
@ -548,7 +548,7 @@ void screen_set_num_desktops(guint num)
screen_update_areas(); screen_update_areas();
/* may be some unnamed desktops that we need to fill in with names /* may be some unnamed desktops that we need to fill in with names
(after updating the areas so the popup can resize) */ (after updating the areas so the popup can resize) */
screen_update_desktop_names(); screen_update_desktop_names();
/* change our desktop if we're on one that no longer exists! */ /* change our desktop if we're on one that no longer exists! */