diff options
| author | Gregory Leblanc <gleblanc@linuxweasel.com> | 2001-11-16 07:22:18 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2001-11-16 07:22:18 +0000 |
| commit | 4fa37b58d1911cd23f87b954456197cd3b3f0e87 (patch) | |
| tree | 3b5aa68bdb45fe1836f5fb3cfd223d9ccf8aa2bf /daemon/gdm.h | |
| parent | 38d40ad718e7f934349e275b4b234faa22701efc (diff) | |
| download | gdm-4fa37b58d1911cd23f87b954456197cd3b3f0e87.tar.gz | |
some build fixes
Thu Nov 15 23:25:41 2001 George Lebl <jirka@5z.com>
* configure.in: some build fixes
* **/*.c: remove RCSid's as they are un-fun for merging
* Merge from gdm-2-2:
Thu Nov 15 21:18:48 2001 George Lebl <jirka@5z.com>
* daemon/gdm.[ch], daemon/slave.[ch], daemon/server.c, gui/gdmlogin.c:
clean up a bit of the constants mess (though it's still an utter
mess). Implement a new SUP opcode so that the daemon knows
when the server was started so that it can start local servers
in order, so that things like complete machine lockups don't occur
(I got one just testing this). Also add a 3 second 'padding'
between server starts to really be sure.
* config/gdm.conf.in: add some comments, mostly for distributions
2001-11-06 Gregory Leblanc <gleblanc@linuxweasel.com>
* gdm.spec.in: more minor updates, just to piss George off. :-)
There's a ChangeLog in the file, if you care that much.
Diffstat (limited to 'daemon/gdm.h')
| -rw-r--r-- | daemon/gdm.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/daemon/gdm.h b/daemon/gdm.h index 9221935a..982357d3 100644 --- a/daemon/gdm.h +++ b/daemon/gdm.h @@ -41,10 +41,9 @@ #define SERVER_IS_FLEXI(d) (d->type == TYPE_FLEXI || \ d->type == TYPE_FLEXI_XNEST) -#define SERVER_SUCCESS 0 /* X server default */ -#define SERVER_FAILURE 1 /* X server default */ +/* These are the servstat values, also used as server + * process exit codes */ #define SERVER_TIMEOUT 2 /* Server didn't start */ -#define SERVER_NOTFOUND 127 /* X server default */ #define SERVER_DEAD 250 /* Server stopped */ #define SERVER_STARTED 251 /* Server started but not ready for connections yet */ #define SERVER_RUNNING 252 /* Server running and ready for connections */ @@ -53,7 +52,7 @@ /* DO NOTE USE 1, that's used as error if x connection fails usually */ /* Note that there is no reasons why these were a power of two, and note * that they have to fit in 256 */ -#define DISPLAY_SUCCESS 0 /* All systems are go */ +/* These are the exit codes */ #define DISPLAY_REMANAGE 2 /* Restart display */ #define DISPLAY_ABORT 4 /* Houston, we have a problem */ #define DISPLAY_REBOOT 8 /* Rebewt */ @@ -61,14 +60,16 @@ #define DISPLAY_SUSPEND 17 /* Suspend */ #define DISPLAY_CHOSEN 20 /* successful chooser session, restart display */ -#define DISPLAY_DEAD 32 /* Display not configured/started yet */ #define DISPLAY_XFAILED 64 /* X failed */ #define DISPLAY_RESTARTGDM 128 /* Restart GDM */ -#define XDMCP_DEAD 0 -#define XDMCP_PENDING 1 -#define XDMCP_MANAGED 2 - +enum { + DISPLAY_UNBORN /* Not yet started */, + DISPLAY_ALIVE /* Yay! we're alive (non-xdmcp) */, + XDMCP_PENDING /* Pending XDMCP display */, + XDMCP_MANAGED /* Managed XDMCP display */, + DISPLAY_DEAD /* Left for dead */ +}; /* Opcodes for the highly sophisticated protocol used for * daemon<->greeter communications */ @@ -413,6 +414,7 @@ void gdm_quit (void); /* 5 = Xnest can't connect */ #define GDM_SOP_FLEXI_OK "FLEXI_OK" /* <slave pid> */ #define GDM_SOP_SOFT_RESTART "SOFT_RESTART" /* no arguments */ +#define GDM_SOP_START_NEXT_LOCAL "START_NEXT_LOCAL" /* no arguments */ #define GDM_SUP_SOCKET "/tmp/.gdm_socket" |