thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI

Browse Source 
Problem:    balloon_show() only works in terminal when compiled with the GUI.
Solution:   Add FEAT_BEVAL_GUI and refactor to move common code out of the GUI
            specific file.
This commit is contained in:
Bram Moolenaar
2017-11-18 22:13:31 +01:00
parent c7d16dce2f
commit c3719bd87b
35 changed files with 574 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/beval.h Normal file
View File

@@ -0,0 +1,83 @@
/* vi:set ts=8 sts=4 sw=4 noet:
*
* VIM - Vi IMproved by Bram Moolenaar
* Visual Workshop integration by Gordon Prieur
*
* Do ":help uganda" in Vim to read copying and usage conditions.
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#if !defined(BEVAL__H) && (defined(FEAT_BEVAL) || defined(PROTO))
#define BEVAL__H
#ifdef FEAT_GUI_GTK
# ifdef USE_GTK3
# include <gtk/gtk.h>
# else
# include <gtk/gtkwidget.h>
# endif
#else
# if defined(FEAT_GUI_X11)
# include <X11/Intrinsic.h>
# endif
#endif
typedef enum
{
ShS_NEUTRAL, /* nothing showing or pending */
ShS_PENDING, /* data requested from debugger */
ShS_UPDATE_PENDING, /* switching information displayed */
ShS_SHOWING /* the balloon is being displayed */
} BeState;
typedef struct BalloonEvalStruct
{
#ifdef FEAT_GUI_GTK
GtkWidget *target; /* widget we are monitoring */
GtkWidget *balloonShell;
GtkWidget *balloonLabel;
unsigned int timerID; /* timer for run */
BeState showState; /* tells us whats currently going on */
int x;
int y;
unsigned int state; /* Button/Modifier key state */
#else
# if !defined(FEAT_GUI_W32)
Widget target; /* widget we are monitoring */
Widget balloonShell;
Widget balloonLabel;
XtIntervalId timerID; /* timer for run */
BeState showState; /* tells us whats currently going on */
XtAppContext appContext; /* used in event handler */
Position x;
Position y;
Position x_root;
Position y_root;
int state; /* Button/Modifier key state */
# else
HWND target;
HWND balloon;
int x;
int y;
BeState showState; /* tells us whats currently going on */
# endif
#endif
int ts; /* tabstop setting for this buffer */
char_u *msg;
void (*msgCB)(struct BalloonEvalStruct *, int);
void *clientData; /* For callback */
#if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
Dimension screen_width; /* screen width in pixels */
Dimension screen_height; /* screen height in pixels */
#endif
} BalloonEval;
#define EVAL_OFFSET_X 15 /* displacement of beval topleft corner from pointer */
#define EVAL_OFFSET_Y 10
#include "beval.pro"
#ifdef FEAT_BEVAL_GUI
# include "gui_beval.pro"
#endif
#endif /* BEVAL__H and FEAT_BEVAL_GUI */