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

add the NONE cursor.

Browse source 
remove startup notification code from openbox.c and openbox.h
call the new sn_startup/shutdown for startupnotification.c
This commit is contained in:
Dana Jansens 2003-09-03 20:39:11 +00:00
parent 15450dc799
commit 973507ff28
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openbox/openbox.c
View file

@ -7,8 +7,8 @@
#include "client.h" #include "client.h"
#include "xerror.h" #include "xerror.h"
#include "prop.h" #include "prop.h"
#include "startup.h"
#include "screen.h" #include "screen.h"
#include "startupnotify.h"
#include "focus.h" #include "focus.h"
#include "moveresize.h" #include "moveresize.h"
#include "frame.h" #include "frame.h"
@ -127,10 +127,6 @@ int main(int argc, char **argv)
session_load(sm_save_file); session_load(sm_save_file);
session_startup(argc, argv); session_startup(argc, argv);
#ifdef USE_LIBSN
ob_sn_display = sn_display_new(ob_display, NULL, NULL);
#endif
ob_screen = DefaultScreen(ob_display); ob_screen = DefaultScreen(ob_display);
ob_rr_inst = RrInstanceNew(ob_display, ob_screen); ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
@ -155,6 +151,7 @@ int main(int argc, char **argv)
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display))); putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
/* create available cursors */ /* create available cursors */
cursors[OB_CURSOR_NONE] = None;
cursors[OB_CURSOR_POINTER] = cursors[OB_CURSOR_POINTER] =
XCreateFontCursor(ob_display, XC_left_ptr); XCreateFontCursor(ob_display, XC_left_ptr);
cursors[OB_CURSOR_BUSY] = cursors[OB_CURSOR_BUSY] =
@ -195,9 +192,6 @@ int main(int argc, char **argv)
prop_startup(); /* get atoms values for the display */ prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */ extensions_query_all(); /* find which extensions are present */
/* save stuff that we can use to restore state */
startup_save();
if (screen_annex()) { /* it will be ours! */ if (screen_annex()) { /* it will be ours! */
do { do {
event_startup(reconfigure); event_startup(reconfigure);
@ -206,6 +200,7 @@ int main(int argc, char **argv)
anything that calls stacking_add */ anything that calls stacking_add */
focus_startup(reconfigure); focus_startup(reconfigure);
window_startup(reconfigure); window_startup(reconfigure);
sn_startup(reconfigure);
{ {
ObParseInst *i; ObParseInst *i;
@ -272,6 +267,7 @@ int main(int argc, char **argv)
screen_shutdown(reconfigure); screen_shutdown(reconfigure);
focus_shutdown(reconfigure); focus_shutdown(reconfigure);
moveresize_shutdown(reconfigure); moveresize_shutdown(reconfigure);
sn_shutdown(reconfigure);
window_shutdown(reconfigure); window_shutdown(reconfigure);
grab_shutdown(reconfigure); grab_shutdown(reconfigure);
event_shutdown(reconfigure); event_shutdown(reconfigure);
@ -285,10 +281,6 @@ int main(int argc, char **argv)
session_shutdown(); session_shutdown();
g_free(ob_sm_id); g_free(ob_sm_id);
#ifdef USE_LIBSN
sn_display_unref(ob_sn_display);
#endif
XCloseDisplay(ob_display); XCloseDisplay(ob_display);
if (restart) { if (restart) {

9
openbox/openbox.h
View file

@ -6,11 +6,6 @@
#include "render/render.h" #include "render/render.h"
#include "render/theme.h" #include "render/theme.h"
#ifdef USE_LIBSN
# define SN_API_NOT_YET_FROZEN
# include <libsn/sn.h>
#endif
#include <glib.h> #include <glib.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -24,10 +19,6 @@ extern struct _ObMainLoop *ob_main_loop;
/*! The X display */ /*! The X display */
extern Display *ob_display; extern Display *ob_display;
#ifdef USE_LIBSN
SnDisplay *ob_sn_display;
#endif
/*! The number of the screen on which we're running */ /*! The number of the screen on which we're running */
extern gint ob_screen; extern gint ob_screen;