diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-08-25 13:53:37 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-08-29 22:00:55 -0700 |
| commit | ff53285ae3f604e9f2cc5f4837255220459b5e44 (patch) | |
| tree | 1d6a959cc46f71355b22bdfb42bf460e83ff83c6 /src/xcb_conn.c | |
| parent | 90889794ad882a6847bcffe52c4cc5dfd168f1f4 (diff) | |
Return connection failure if display string specifies non-existent screen
Matches the behaviour of Xlib - if you set DISPLAY to :0.1 but only have
one screen, closes connection and returns error.
This introduces a new connection error code:
XCB_CONN_CLOSED_INVALID_SCREEN
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'src/xcb_conn.c')
| -rw-r--r-- | src/xcb_conn.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 7202cc5..7979491 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -66,6 +66,7 @@ typedef struct { static const int xcb_con_error = XCB_CONN_ERROR; static const int xcb_con_closed_mem_er = XCB_CONN_CLOSED_MEM_INSUFFICIENT; static const int xcb_con_closed_parse_er = XCB_CONN_CLOSED_PARSE_ERR; +static const int xcb_con_closed_screen_er = XCB_CONN_CLOSED_INVALID_SCREEN; static int set_fd_flags(const int fd) { @@ -349,6 +350,10 @@ xcb_connection_t *_xcb_conn_ret_error(int err) { return (xcb_connection_t *) &xcb_con_closed_parse_er; } + case XCB_CONN_CLOSED_INVALID_SCREEN: + { + return (xcb_connection_t *) &xcb_con_closed_screen_er; + } case XCB_CONN_ERROR: default: { |