Skip to content
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

exit when X server is not available or cannot be connected #11

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

exit when X server is not available or cannot be connected #11

Show file tree
Hide file tree
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
16 changes: 16 additions & 0 deletions src/randr-conn-private.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,21 @@ poll_events (gint fd, GIOCondition condition, gpointer user_data)
return TRUE;
}

static gboolean
disconnected_event (gint fd, GIOCondition condition, gpointer user_data)
{
struct randr_conn *conn = (struct randr_conn *) user_data;
(void) fd;

if(condition == G_IO_HUP) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,
please obey the formatting rules of the project.

g_signal_emit (conn->object,
randr_signals[SIG_DISCONNECTED], 0);
return FALSE;
}

return TRUE;
}

static inline void
setup_events (struct randr_conn *conn)
{
Expand All @@ -334,6 +349,7 @@ setup_events (struct randr_conn *conn)
XNextEvent (conn->dpy, &ev);
}
g_unix_fd_add (ConnectionNumber (conn->dpy), G_IO_IN, poll_events, conn);
g_unix_fd_add (ConnectionNumber (conn->dpy), G_IO_HUP, disconnected_event, conn);
}

void
Expand Down
1 change: 1 addition & 0 deletions src/randr-conn-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ struct randr_display_priv {
enum {
SIG_DISPLAY_ADDED,
SIG_DISPLAY_REMOVED,
SIG_DISCONNECTED,
N_SIG
};

Expand Down
12 changes: 12 additions & 0 deletions src/randr-conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ randr_conn_class_init (RandrConnClass *klass)
NULL, NULL, NULL,
G_TYPE_NONE, 1, G_TYPE_POINTER);

randr_signals[SIG_DISCONNECTED] = g_signal_new ("disconnected",
G_TYPE_FROM_CLASS (obj_class), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RandrConnClass, disconnected),
NULL, NULL, NULL,
G_TYPE_NONE, 0);

g_object_class_install_property (obj_class, PROP_DISPLAY,
g_param_spec_string ("display", NULL, "X Display", NULL,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)
Expand All @@ -117,6 +123,12 @@ RandrConn *
randr_conn_new (const gchar *display)
{
RandrConn *obj = RANDR_CONN (g_object_new (RANDR_TYPE_CONN, "display", display, NULL));

if (obj->priv->dpy == NULL) {
g_object_unref(obj);
return NULL;
}

return obj;
}

Expand Down
1 change: 1 addition & 0 deletions src/randr-conn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ typedef struct _RandrConnClass {
GObjectClass parent;
void (*display_added) (RandrConn *conn, const struct randr_display *disp);
void (*display_removed) (RandrConn *conn, const struct randr_display *disp);
void (*disconnected) (RandrConn *conn);
} RandrConnClass;


Expand Down
16 changes: 16 additions & 0 deletions src/xiccd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,13 @@ randr_display_removed_sig (RandrConn *conn, struct randr_display *disp, Daemon *
g_object_unref (device);
}

static void
randr_disconnected (RandrConn *conn, Daemon *daemon)
{
(void) daemon;
exit(0);
}


static void
cd_existing_devices_cb (GObject *src, GAsyncResult *res, gpointer user_data)
Expand Down Expand Up @@ -556,6 +563,9 @@ cd_connect_cb (GObject *src, GAsyncResult *res, gpointer user_data)
g_signal_connect (daemon->rcon, "display-removed",
G_CALLBACK (randr_display_removed_sig), daemon);

g_signal_connect (daemon->rcon, "disconnected",
G_CALLBACK (randr_disconnected), daemon);

g_signal_connect (daemon->stor, "added",
G_CALLBACK (cd_icc_store_file_added_sig), daemon);

Expand Down Expand Up @@ -614,6 +624,12 @@ main (int argc, char *argv[])

daemon.loop = g_main_loop_new (NULL, FALSE);
daemon.rcon = randr_conn_new (config.display);

if (daemon.rcon == NULL) {
g_critical ("Cannot connect to X server. Exiting");
return 1;
}

daemon.cli = cd_client_new ();
daemon.stor = cd_icc_store_new ();

Expand Down