aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
Code

Do not try to use gpm in X11.

Browse Source 
X11 is detected by checking DISPLAY variable.
Without this ELinks stopped on reading from /dev/gpmctl.
This commit is contained in:
witekfl 2011-07-06 13:19:09 +02:00
parent 03c698e926
commit 8183aecd90
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/socket.c
View File

@ -81,7 +81,7 @@ struct socket_weak_ref {
static INIT_LIST_OF(struct socket_weak_ref, socket_weak_refs); static INIT_LIST_OF(struct socket_weak_ref, socket_weak_refs);
/* To enable logging of tranfers, for debugging purposes. */ /* To enable logging of tranfers, for debugging purposes. */
#if 0 #if 1
#define DEBUG_TRANSFER_LOGFILE "/tmp/log" #define DEBUG_TRANSFER_LOGFILE "/tmp/log"

5
src/osdep/unix/unix.c
View File

@ -10,6 +10,8 @@
#include <gpm.h> #include <gpm.h>
#endif #endif
#include <stdlib.h>
#include "elinks.h" #include "elinks.h"
#include "main/select.h" #include "main/select.h"
@ -80,6 +82,9 @@ static int
init_mouse(int cons, int suspend) init_mouse(int cons, int suspend)
{ {
Gpm_Connect conn; Gpm_Connect conn;
unsigned char *display = getenv("DISPLAY");
if (display && *display) return -1;
/* We want to get even move events because of the wheels. */ /* We want to get even move events because of the wheels. */
conn.eventMask = suspend ? 0 : ~0; conn.eventMask = suspend ? 0 : ~0;