ncurses/ncurses-5.7-gpm.dif
OBS User autobuild a76d3e453b Accepting request 29358 from Base:System
Copy from Base:System/ncurses based on submit request 29358 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/29358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=26
2010-01-14 14:17:59 +00:00

27 lines
791 B
Plaintext

--- ncurses/base/lib_mouse.c
+++ ncurses/base/lib_mouse.c 2010-01-12 10:24:16.223429669 +0000
@@ -380,6 +380,11 @@ allow_gpm_mouse(void)
{
bool result = FALSE;
+#ifdef weak_symbol
+ /* Danger Robinson: do not use dlopen for libgpm if already loaded */
+ if ((Gpm_Wgetch))
+ return FALSE;
+#endif
/* GPM does printf's without checking if stdout is a terminal */
if (isatty(fileno(stdout))) {
char *list = getenv("NCURSES_GPM_TERMS");
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2008-04-11 15:33:59.000000000 +0000
@@ -608,6 +608,9 @@ typedef struct {
#if USE_GPM_SUPPORT
#undef buttons /* term.h defines this, and gpm uses it! */
#include <gpm.h>
+#ifdef weak_symbol
+weak_symbol(Gpm_Wgetch);
+#endif
#ifdef HAVE_LIBDL
/* link dynamically to GPM */