projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More preparatory work: remove the <windows.h> include from lots of
[u/mdw/putty]
/
unix
/
pterm.c
diff --git
a/unix/pterm.c
b/unix/pterm.c
index
53ca442
..
4113e51
100644
(file)
--- a/
unix/pterm.c
+++ b/
unix/pterm.c
@@
-50,16
+50,25
@@
struct gui_data {
guint term_paste_idle_id;
GdkAtom compound_text_atom;
int alt_keycode;
guint term_paste_idle_id;
GdkAtom compound_text_atom;
int alt_keycode;
+ int alt_digits;
char wintitle[sizeof(((Config *)0)->wintitle)];
char icontitle[sizeof(((Config *)0)->wintitle)];
int master_fd, master_func_id, exited;
char wintitle[sizeof(((Config *)0)->wintitle)];
char icontitle[sizeof(((Config *)0)->wintitle)];
int master_fd, master_func_id, exited;
+ void *ldisc;
+ Backend *back;
+ void *backhandle;
+ Terminal *term;
+ void *logctx;
+};
+
+struct draw_ctx {
+ GdkGC *gc;
+ struct gui_data *inst;
};
};
-static struct gui_data the_inst;
-static struct gui_data *inst = &the_inst; /* so we always write `inst->' */
static int send_raw_mouse;
static int send_raw_mouse;
-void ldisc_update(int echo, int edit)
+void ldisc_update(
void *frontend,
int echo, int edit)
{
/*
* This is a stub in pterm. If I ever produce a Unix
{
/*
* This is a stub in pterm. If I ever produce a Unix
@@
-69,7
+78,7
@@
void ldisc_update(int echo, int edit)
*/
}
*/
}
-int askappend(char *filename)
+int askappend(
void *frontend,
char *filename)
{
/*
* Logging in an xterm-alike is liable to be something you only
{
/*
* Logging in an xterm-alike is liable to be something you only
@@
-80,7
+89,7
@@
int askappend(char *filename)
return 2;
}
return 2;
}
-void logevent(char *string)
+void logevent(
void *frontend,
char *string)
{
/*
* This is not a very helpful function: events are logged
{
/*
* This is not a very helpful function: events are logged
@@
-89,8
+98,10
@@
void logevent(char *string)
*/
}
*/
}
-int font_dimension(
int which)
/* 0 for width, 1 for height */
+int font_dimension(
void *frontend, int which)
/* 0 for width, 1 for height */
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
+
if (which)
return inst->font_height;
else
if (which)
return inst->font_height;
else
@@
-106,8
+117,10
@@
int font_dimension(int which) /* 0 for width, 1 for height */
* mouse or a means of faking it, and there is no need to switch
* buttons around at all.
*/
* mouse or a means of faking it, and there is no need to switch
* buttons around at all.
*/
-Mouse_Button translate_button(Mouse_Button button)
+Mouse_Button translate_button(
void *frontend,
Mouse_Button button)
{
{
+ /* struct gui_data *inst = (struct gui_data *)frontend; */
+
if (button == MBT_LEFT)
return MBT_SELECT;
if (button == MBT_MIDDLE)
if (button == MBT_LEFT)
return MBT_SELECT;
if (button == MBT_MIDDLE)
@@
-121,12
+134,13
@@
Mouse_Button translate_button(Mouse_Button button)
* Minimise or restore the window in response to a server-side
* request.
*/
* Minimise or restore the window in response to a server-side
* request.
*/
-void set_iconic(int iconic)
+void set_iconic(
void *frontend,
int iconic)
{
/*
* GTK 1.2 doesn't know how to do this.
*/
#if GTK_CHECK_VERSION(2,0,0)
{
/*
* GTK 1.2 doesn't know how to do this.
*/
#if GTK_CHECK_VERSION(2,0,0)
+ struct gui_data *inst = (struct gui_data *)frontend;
if (iconic)
gtk_window_iconify(GTK_WINDOW(inst->window));
else
if (iconic)
gtk_window_iconify(GTK_WINDOW(inst->window));
else
@@
-137,8
+151,9
@@
void set_iconic(int iconic)
/*
* Move the window in response to a server-side request.
*/
/*
* Move the window in response to a server-side request.
*/
-void move_window(int x, int y)
+void move_window(
void *frontend,
int x, int y)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
@@
-155,8
+170,9
@@
void move_window(int x, int y)
* Move the window to the top or bottom of the z-order in response
* to a server-side request.
*/
* Move the window to the top or bottom of the z-order in response
* to a server-side request.
*/
-void set_zorder(int top)
+void set_zorder(
void *frontend,
int top)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
if (top)
gdk_window_raise(inst->window->window);
else
if (top)
gdk_window_raise(inst->window->window);
else
@@
-166,21
+182,23
@@
void set_zorder(int top)
/*
* Refresh the window in response to a server-side request.
*/
/*
* Refresh the window in response to a server-side request.
*/
-void refresh_window(void)
+void refresh_window(void
*frontend
)
{
{
- term_invalidate(term);
+ struct gui_data *inst = (struct gui_data *)frontend;
+ term_invalidate(inst->term);
}
/*
* Maximise or restore the window in response to a server-side
* request.
*/
}
/*
* Maximise or restore the window in response to a server-side
* request.
*/
-void set_zoomed(int zoomed)
+void set_zoomed(
void *frontend,
int zoomed)
{
/*
* GTK 1.2 doesn't know how to do this.
*/
#if GTK_CHECK_VERSION(2,0,0)
{
/*
* GTK 1.2 doesn't know how to do this.
*/
#if GTK_CHECK_VERSION(2,0,0)
+ struct gui_data *inst = (struct gui_data *)frontend;
if (iconic)
gtk_window_maximize(GTK_WINDOW(inst->window));
else
if (iconic)
gtk_window_maximize(GTK_WINDOW(inst->window));
else
@@
-191,16
+209,18
@@
void set_zoomed(int zoomed)
/*
* Report whether the window is iconic, for terminal reports.
*/
/*
* Report whether the window is iconic, for terminal reports.
*/
-int is_iconic(void)
+int is_iconic(void
*frontend
)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
return !gdk_window_is_viewable(inst->window->window);
}
/*
* Report the window's position, for terminal reports.
*/
return !gdk_window_is_viewable(inst->window->window);
}
/*
* Report the window's position, for terminal reports.
*/
-void get_window_pos(int *x, int *y)
+void get_window_pos(
void *frontend,
int *x, int *y)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
@@
-216,8
+236,9
@@
void get_window_pos(int *x, int *y)
/*
* Report the window's pixel size, for terminal reports.
*/
/*
* Report the window's pixel size, for terminal reports.
*/
-void get_window_pixels(int *x, int *y)
+void get_window_pixels(
void *frontend,
int *x, int *y)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
/*
* I assume that when the GTK version of this call is available
* we should use it. Not sure how it differs from the GDK one,
@@
-233,8
+254,9
@@
void get_window_pixels(int *x, int *y)
/*
* Return the window or icon title.
*/
/*
* Return the window or icon title.
*/
-char *get_window_title(int icon)
+char *get_window_title(
void *frontend,
int icon)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
return icon ? inst->wintitle : inst->icontitle;
}
return icon ? inst->wintitle : inst->icontitle;
}
@@
-247,7
+269,7
@@
gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
return FALSE;
}
return FALSE;
}
-
void show_mouseptr(
int show)
+
static void show_mouseptr(struct gui_data *inst,
int show)
{
if (!cfg.hide_mouseptr)
show = 1;
{
if (!cfg.hide_mouseptr)
show = 1;
@@
-293,7
+315,7
@@
gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
}
if (need_size) {
}
if (need_size) {
- term_size(term, h, w, cfg.savelines);
+ term_size(
inst->
term, h, w, cfg.savelines);
}
return TRUE;
}
return TRUE;
@@
-301,7
+323,7
@@
gint configure_area(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
- /* struct gui_data *inst = (struct gui_data *)data; */
+ struct gui_data *inst = (struct gui_data *)data;
/*
* Pass the exposed rectangle to terminal.c, which will call us
/*
* Pass the exposed rectangle to terminal.c, which will call us
@@
-323,7
+345,7
@@
gint expose_area(GtkWidget *widget, GdkEventExpose *event, gpointer data)
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- /* struct gui_data *inst = (struct gui_data *)data; */
+ struct gui_data *inst = (struct gui_data *)data;
char output[32];
int start, end;
char output[32];
int start, end;
@@
-333,11
+355,17
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/*
* If Alt is being released after typing an Alt+numberpad
* sequence, we should generate the code that was typed.
/*
* If Alt is being released after typing an Alt+numberpad
* sequence, we should generate the code that was typed.
+ *
+ * Note that we only do this if more than one key was actually
+ * pressed - I don't think Alt+NumPad4 should be ^D or that
+ * Alt+NumPad3 should be ^C, for example. There's no serious
+ * inconvenience in having to type a zero before a single-digit
+ * character code.
*/
if (event->type == GDK_KEY_RELEASE &&
(event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) &&
*/
if (event->type == GDK_KEY_RELEASE &&
(event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R) &&
- inst->alt_keycode >= 0) {
+ inst->alt_keycode >= 0
&& inst->alt_digits > 1
) {
#ifdef KEY_DEBUGGING
printf("Alt key up, keycode = %d\n", inst->alt_keycode);
#endif
#ifdef KEY_DEBUGGING
printf("Alt key up, keycode = %d\n", inst->alt_keycode);
#endif
@@
-370,6
+398,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) {
inst->alt_keycode = -1;
if ((event->keyval == GDK_Meta_L || event->keyval == GDK_Alt_L ||
event->keyval == GDK_Meta_R || event->keyval == GDK_Alt_R)) {
inst->alt_keycode = -1;
+ inst->alt_digits = 0;
goto done; /* this generates nothing else */
}
goto done; /* this generates nothing else */
}
@@
-404,6
+433,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
inst->alt_keycode = digit; /* one-digit code */
else
inst->alt_keycode = inst->alt_keycode * 10 + digit;
inst->alt_keycode = digit; /* one-digit code */
else
inst->alt_keycode = inst->alt_keycode * 10 + digit;
+ inst->alt_digits++;
#ifdef KEY_DEBUGGING
printf(" gives new code %d\n", inst->alt_keycode);
#endif
#ifdef KEY_DEBUGGING
printf(" gives new code %d\n", inst->alt_keycode);
#endif
@@
-417,11
+447,11
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* at all.
*/
if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
* at all.
*/
if (event->keyval == GDK_Page_Up && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(term, 0, -cfg.height/2);
+ term_scroll(
inst->
term, 0, -cfg.height/2);
return TRUE;
}
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
return TRUE;
}
if (event->keyval == GDK_Page_Down && (event->state & GDK_SHIFT_MASK)) {
- term_scroll(term, 0, +cfg.height/2);
+ term_scroll(
inst->
term, 0, +cfg.height/2);
return TRUE;
}
return TRUE;
}
@@
-429,7
+459,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* Neither does Shift-Ins.
*/
if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) {
* Neither does Shift-Ins.
*/
if (event->keyval == GDK_Insert && (event->state & GDK_SHIFT_MASK)) {
- request_paste();
+ request_paste(
inst
);
return TRUE;
}
return TRUE;
}
@@
-524,7
+554,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
/*
* Application keypad mode.
*/
/*
* Application keypad mode.
*/
- if (term->app_keypad_keys && !cfg.no_applic_k) {
+ if (
inst->
term->app_keypad_keys && !cfg.no_applic_k) {
int xkey = 0;
switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break;
int xkey = 0;
switch (event->keyval) {
case GDK_Num_Lock: xkey = 'P'; break;
@@
-562,7
+592,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break;
}
if (xkey) {
case GDK_KP_Decimal: case GDK_KP_Delete: xkey = 'n'; break;
}
if (xkey) {
- if (term->vt52_mode) {
+ if (
inst->
term->vt52_mode) {
if (xkey >= 'P' && xkey <= 'S')
end = 1 + sprintf(output+1, "\033%c", xkey);
else
if (xkey >= 'P' && xkey <= 'S')
end = 1 + sprintf(output+1, "\033%c", xkey);
else
@@
-670,7
+700,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
if (cfg.funky_type == 3 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
if (cfg.funky_type == 3 && code <= 6)
code = "\0\2\1\4\5\3\6"[code];
- if (term->vt52_mode && code > 0 && code <= 6) {
+ if (
inst->
term->vt52_mode && code > 0 && code <= 6) {
end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]);
goto done;
}
end = 1 + sprintf(output+1, "\x1B%c", " HLMEIG"[code]);
goto done;
}
@@
-709,14
+739,14
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
}
goto done;
}
}
goto done;
}
- if ((term->vt52_mode || cfg.funky_type == 4) &&
+ if ((
inst->
term->vt52_mode || cfg.funky_type == 4) &&
code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
offt++;
if (code > 21)
offt++;
code >= 11 && code <= 24) {
int offt = 0;
if (code > 15)
offt++;
if (code > 21)
offt++;
- if (term->vt52_mode)
+ if (
inst->
term->vt52_mode)
end = 1 + sprintf(output+1,
"\x1B%c", code + 'P' - 11 - offt);
else
end = 1 + sprintf(output+1,
"\x1B%c", code + 'P' - 11 - offt);
else
@@
-729,7
+759,7
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
goto done;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
goto done;
}
if (cfg.funky_type == 2 && code >= 11 && code <= 14) {
- if (term->vt52_mode)
+ if (
inst->
term->vt52_mode)
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
end = 1 + sprintf(output+1, "\x1B%c", code + 'P' - 11);
else
end = 1 + sprintf(output+1, "\x1BO%c", code + 'P' - 11);
@@
-767,9
+797,9
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* app cursor keys mode they do ESC O A instead.
* Ctrl toggles the two modes.
*/
* app cursor keys mode they do ESC O A instead.
* Ctrl toggles the two modes.
*/
- if (term->vt52_mode) {
+ if (
inst->
term->vt52_mode) {
end = 1 + sprintf(output+1, "\033%c", xkey);
end = 1 + sprintf(output+1, "\033%c", xkey);
- } else if (!term->app_cursor_keys ^
+ } else if (!
inst->
term->app_cursor_keys ^
!(event->state & GDK_CONTROL_MASK)) {
end = 1 + sprintf(output+1, "\033O%c", xkey);
} else {
!(event->state & GDK_CONTROL_MASK)) {
end = 1 + sprintf(output+1, "\033O%c", xkey);
} else {
@@
-792,10
+822,10
@@
gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
printf("\n");
#endif
printf("\n");
#endif
- ldisc_send(output+start, end-start, 1);
- show_mouseptr(0);
- term_seen_key_event(term);
- term_out(term);
+ ldisc_send(
inst->ldisc,
output+start, end-start, 1);
+ show_mouseptr(
inst,
0);
+ term_seen_key_event(
inst->
term);
+ term_out(
inst->
term);
}
return TRUE;
}
return TRUE;
@@
-806,14
+836,14
@@
gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button, act;
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button, act;
- show_mouseptr(1);
+ show_mouseptr(
inst,
1);
if (event->button == 4 && event->type == GDK_BUTTON_PRESS) {
if (event->button == 4 && event->type == GDK_BUTTON_PRESS) {
- term_scroll(term, 0, -5);
+ term_scroll(
inst->
term, 0, -5);
return TRUE;
}
if (event->button == 5 && event->type == GDK_BUTTON_PRESS) {
return TRUE;
}
if (event->button == 5 && event->type == GDK_BUTTON_PRESS) {
- term_scroll(term, 0, +5);
+ term_scroll(
inst->
term, 0, +5);
return TRUE;
}
return TRUE;
}
@@
-844,7
+874,7
@@
gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
- term_mouse(term, button, act, x, y, shift, ctrl, alt);
+ term_mouse(
inst->
term, button, act, x, y, shift, ctrl, alt);
return TRUE;
}
return TRUE;
}
@@
-854,7
+884,7
@@
gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button;
struct gui_data *inst = (struct gui_data *)data;
int shift, ctrl, alt, x, y, button;
- show_mouseptr(1);
+ show_mouseptr(
inst,
1);
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
shift = event->state & GDK_SHIFT_MASK;
ctrl = event->state & GDK_CONTROL_MASK;
@@
-871,7
+901,7
@@
gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
x = (event->x - cfg.window_border) / inst->font_width;
y = (event->y - cfg.window_border) / inst->font_height;
- term_mouse(term, button, MA_DRAG, x, y, shift, ctrl, alt);
+ term_mouse(
inst->
term, button, MA_DRAG, x, y, shift, ctrl, alt);
return TRUE;
}
return TRUE;
}
@@
-886,8
+916,8
@@
void done_with_pty(struct gui_data *inst)
gtk_input_remove(inst->master_func_id);
}
gtk_input_remove(inst->master_func_id);
}
- if (!inst->exited &&
back->exitcode(
backhandle) >= 0) {
- int exitcode =
back->exitcode(
backhandle);
+ if (!inst->exited &&
inst->back->exitcode(inst->
backhandle) >= 0) {
+ int exitcode =
inst->back->exitcode(inst->
backhandle);
int clean;
clean = WIFEXITED(exitcode) && (WEXITSTATUS(exitcode) == 0);
int clean;
clean = WIFEXITED(exitcode) && (WEXITSTATUS(exitcode) == 0);
@@
-918,14
+948,16
@@
void done_with_pty(struct gui_data *inst)
" %d (%.400s)]\r\n", WTERMSIG(exitcode),
strsignal(WTERMSIG(exitcode)));
#endif
" %d (%.400s)]\r\n", WTERMSIG(exitcode),
strsignal(WTERMSIG(exitcode)));
#endif
- from_backend((void *)term, 0, message, strlen(message));
+ from_backend((void *)
inst->
term, 0, message, strlen(message));
}
inst->exited = 1;
}
}
}
inst->exited = 1;
}
}
-void frontend_keypress(void)
+void frontend_keypress(void
*handle
)
{
{
+ struct gui_data *inst = (struct gui_data *)handle;
+
/*
* If our child process has exited but not closed, terminate on
* any keypress.
/*
* If our child process has exited but not closed, terminate on
* any keypress.
@@
-938,7
+970,7
@@
gint timer_func(gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
{
struct gui_data *inst = (struct gui_data *)data;
- if (
back->exitcode(
backhandle) >= 0) {
+ if (
inst->back->exitcode(inst->
backhandle) >= 0) {
/*
* The primary child process died. We could keep the
* terminal open for remaining subprocesses to output to,
/*
* The primary child process died. We could keep the
* terminal open for remaining subprocesses to output to,
@@
-951,8
+983,8
@@
gint timer_func(gpointer data)
done_with_pty(inst);
}
done_with_pty(inst);
}
- term_update(term);
- term_blink(term, 0);
+ term_update(
inst->
term);
+ term_blink(
inst->
term, 0);
return TRUE;
}
return TRUE;
}
@@
-975,9
+1007,9
@@
void pty_input_func(gpointer data, gint sourcefd, GdkInputCondition condition)
perror("read pty master");
exit(1);
} else if (ret > 0)
perror("read pty master");
exit(1);
} else if (ret > 0)
- from_backend(term, 0, buf, ret);
- term_blink(term, 1);
- term_out(term);
+ from_backend(
inst->
term, 0, buf, ret);
+ term_blink(
inst->
term, 1);
+ term_out(
inst->
term);
}
void destroy(GtkWidget *widget, gpointer data)
}
void destroy(GtkWidget *widget, gpointer data)
@@
-987,29
+1019,32
@@
void destroy(GtkWidget *widget, gpointer data)
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
- term->has_focus = event->in;
- term_out(term);
- term_update(term);
- show_mouseptr(1);
+ struct gui_data *inst = (struct gui_data *)data;
+ inst->term->has_focus = event->in;
+ term_out(inst->term);
+ term_update(inst->term);
+ show_mouseptr(inst, 1);
return FALSE;
}
/*
* set or clear the "raw mouse message" mode
*/
return FALSE;
}
/*
* set or clear the "raw mouse message" mode
*/
-void set_raw_mouse_mode(int activate)
+void set_raw_mouse_mode(
void *frontend,
int activate)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
activate = activate && !cfg.no_mouse_rep;
send_raw_mouse = activate;
if (send_raw_mouse)
inst->currcursor = inst->rawcursor;
else
inst->currcursor = inst->textcursor;
activate = activate && !cfg.no_mouse_rep;
send_raw_mouse = activate;
if (send_raw_mouse)
inst->currcursor = inst->rawcursor;
else
inst->currcursor = inst->textcursor;
- show_mouseptr(inst->mouseptr_visible);
+ show_mouseptr(inst
, inst
->mouseptr_visible);
}
}
-void request_resize(int w, int h)
+void request_resize(
void *frontend,
int w, int h)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
int large_x, large_y;
int offset_x, offset_y;
int area_x, area_y;
int large_x, large_y;
int offset_x, offset_y;
int area_x, area_y;
@@
-1035,7
+1070,7
@@
void request_resize(int w, int h)
* bogus size request which guarantees to be bigger than the
* current size of the drawing area.
*/
* bogus size request which guarantees to be bigger than the
* current size of the drawing area.
*/
- get_window_pixels(&large_x, &large_y);
+ get_window_pixels(
inst,
&large_x, &large_y);
large_x += 32;
large_y += 32;
large_x += 32;
large_y += 32;
@@
-1074,7
+1109,7
@@
void request_resize(int w, int h)
#endif
}
#endif
}
-
void real_palette_set(
int n, int r, int g, int b)
+
static void real_palette_set(struct gui_data *inst,
int n, int r, int g, int b)
{
gboolean success[1];
{
gboolean success[1];
@@
-1089,7
+1124,7
@@
void real_palette_set(int n, int r, int g, int b)
n, r, g, b);
}
n, r, g, b);
}
-void set_window_background(
void
)
+void set_window_background(
struct gui_data *inst
)
{
if (inst->area && inst->area->window)
gdk_window_set_background(inst->area->window, &inst->cols[18]);
{
if (inst->area && inst->area->window)
gdk_window_set_background(inst->area->window, &inst->cols[18]);
@@
-1097,22
+1132,24
@@
void set_window_background(void)
gdk_window_set_background(inst->window->window, &inst->cols[18]);
}
gdk_window_set_background(inst->window->window, &inst->cols[18]);
}
-void palette_set(int n, int r, int g, int b)
+void palette_set(
void *frontend,
int n, int r, int g, int b)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
static const int first[21] = {
0, 2, 4, 6, 8, 10, 12, 14,
1, 3, 5, 7, 9, 11, 13, 15,
16, 17, 18, 20, 22
};
static const int first[21] = {
0, 2, 4, 6, 8, 10, 12, 14,
1, 3, 5, 7, 9, 11, 13, 15,
16, 17, 18, 20, 22
};
- real_palette_set(first[n], r, g, b);
+ real_palette_set(
inst,
first[n], r, g, b);
if (first[n] >= 18)
if (first[n] >= 18)
- real_palette_set(first[n] + 1, r, g, b);
+ real_palette_set(
inst,
first[n] + 1, r, g, b);
if (first[n] == 18)
if (first[n] == 18)
- set_window_background();
+ set_window_background(
inst
);
}
}
-void palette_reset(void)
+void palette_reset(void
*frontend
)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/* This maps colour indices in cfg to those used in inst->cols. */
static const int ww[] = {
6, 7, 8, 9, 10, 11, 12, 13,
/* This maps colour indices in cfg to those used in inst->cols. */
static const int ww[] = {
6, 7, 8, 9, 10, 11, 12, 13,
@@
-1144,11
+1181,12
@@
void palette_reset(void)
i, cfg.colours[i][0], cfg.colours[i][1], cfg.colours[i][2]);
}
i, cfg.colours[i][0], cfg.colours[i][1], cfg.colours[i][2]);
}
- set_window_background();
+ set_window_background(
inst
);
}
}
-void write_clip(wchar_t * data, int len, int must_deselect)
+void write_clip(
void *frontend,
wchar_t * data, int len, int must_deselect)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
if (inst->pasteout_data)
sfree(inst->pasteout_data);
inst->pasteout_data = smalloc(len);
if (inst->pasteout_data)
sfree(inst->pasteout_data);
inst->pasteout_data = smalloc(len);
@@
-1168,6
+1206,7
@@
void write_clip(wchar_t * data, int len, int must_deselect)
void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
guint info, guint time_stamp, gpointer data)
{
void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
guint info, guint time_stamp, gpointer data)
{
+ struct gui_data *inst = (struct gui_data *)data;
gtk_selection_data_set(seldata, GDK_SELECTION_TYPE_STRING, 8,
inst->pasteout_data, inst->pasteout_data_len);
}
gtk_selection_data_set(seldata, GDK_SELECTION_TYPE_STRING, 8,
inst->pasteout_data, inst->pasteout_data_len);
}
@@
-1175,7
+1214,8
@@
void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
gpointer data)
{
gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
gpointer data)
{
- term_deselect(term);
+ struct gui_data *inst = (struct gui_data *)data;
+ term_deselect(inst->term);
if (inst->pasteout_data)
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
if (inst->pasteout_data)
sfree(inst->pasteout_data);
inst->pasteout_data = NULL;
@@
-1183,8
+1223,9
@@
gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
return TRUE;
}
return TRUE;
}
-void request_paste(void)
+void request_paste(void
*frontend
)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
/*
* In Unix, pasting is asynchronous: all we can do at the
* moment is to call gtk_selection_convert(), and when the data
/*
* In Unix, pasting is asynchronous: all we can do at the
* moment is to call gtk_selection_convert(), and when the data
@@
-1197,8
+1238,10
@@
void request_paste(void)
gint idle_paste_func(gpointer data); /* forward ref */
void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
gint idle_paste_func(gpointer data); /* forward ref */
void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
- gpointer data)
+ g
uint time, g
pointer data)
{
{
+ struct gui_data *inst = (struct gui_data *)data;
+
if (seldata->length <= 0 ||
seldata->type != GDK_SELECTION_TYPE_STRING)
return; /* Nothing happens. */
if (seldata->length <= 0 ||
seldata->type != GDK_SELECTION_TYPE_STRING)
return; /* Nothing happens. */
@@
-1211,9
+1254,9
@@
void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
mb_to_wc(0, 0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
mb_to_wc(0, 0, seldata->data, seldata->length,
inst->pastein_data, inst->pastein_data_len);
- term_do_paste(term);
+ term_do_paste(
inst->
term);
- if (term_paste_pending(term))
+ if (term_paste_pending(
inst->
term))
inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
}
inst->term_paste_idle_id = gtk_idle_add(idle_paste_func, inst);
}
@@
-1221,8
+1264,8
@@
gint idle_paste_func(gpointer data)
{
struct gui_data *inst = (struct gui_data *)data;
{
struct gui_data *inst = (struct gui_data *)data;
- if (term_paste_pending(term))
- term_paste(term);
+ if (term_paste_pending(
inst->
term))
+ term_paste(
inst->
term);
else
gtk_idle_remove(inst->term_paste_idle_id);
else
gtk_idle_remove(inst->term_paste_idle_id);
@@
-1230,30
+1273,35
@@
gint idle_paste_func(gpointer data)
}
}
-void get_clip(wchar_t ** p, int *len)
+void get_clip(
void *frontend,
wchar_t ** p, int *len)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
+
if (p) {
*p = inst->pastein_data;
*len = inst->pastein_data_len;
}
}
if (p) {
*p = inst->pastein_data;
*len = inst->pastein_data_len;
}
}
-void set_title(char *title)
+void set_title(
void *frontend,
char *title)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
strncpy(inst->wintitle, title, lenof(inst->wintitle));
inst->wintitle[lenof(inst->wintitle)-1] = '\0';
gtk_window_set_title(GTK_WINDOW(inst->window), inst->wintitle);
}
strncpy(inst->wintitle, title, lenof(inst->wintitle));
inst->wintitle[lenof(inst->wintitle)-1] = '\0';
gtk_window_set_title(GTK_WINDOW(inst->window), inst->wintitle);
}
-void set_icon(char *title)
+void set_icon(
void *frontend,
char *title)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
strncpy(inst->icontitle, title, lenof(inst->icontitle));
inst->icontitle[lenof(inst->icontitle)-1] = '\0';
gdk_window_set_icon_name(inst->window->window, inst->icontitle);
}
strncpy(inst->icontitle, title, lenof(inst->icontitle));
inst->icontitle[lenof(inst->icontitle)-1] = '\0';
gdk_window_set_icon_name(inst->window->window, inst->icontitle);
}
-void set_sbar(int total, int start, int page)
+void set_sbar(
void *frontend,
int total, int start, int page)
{
{
+ struct gui_data *inst = (struct gui_data *)frontend;
if (!cfg.scrollbar)
return;
inst->sbar_adjust->lower = 0;
if (!cfg.scrollbar)
return;
inst->sbar_adjust->lower = 0;
@@
-1269,22
+1317,31
@@
void set_sbar(int total, int start, int page)
void scrollbar_moved(GtkAdjustment *adj, gpointer data)
{
void scrollbar_moved(GtkAdjustment *adj, gpointer data)
{
+ struct gui_data *inst = (struct gui_data *)data;
+
if (!cfg.scrollbar)
return;
if (!inst->ignore_sbar)
if (!cfg.scrollbar)
return;
if (!inst->ignore_sbar)
- term_scroll(term, 1, (int)adj->value);
+ term_scroll(
inst->
term, 1, (int)adj->value);
}
}
-void sys_cursor(int x, int y)
+void sys_cursor(
void *frontend,
int x, int y)
{
/*
* This is meaningless under X.
*/
}
{
/*
* This is meaningless under X.
*/
}
-void beep(int mode)
+/*
+ * This is still called when mode==BELL_VISUAL, even though the
+ * visual bell is handled entirely within terminal.c, because we
+ * may want to perform additional actions on any kind of bell (for
+ * example, taskbar flashing in Windows).
+ */
+void beep(void *frontend, int mode)
{
{
- gdk_beep();
+ if (mode != BELL_VISUAL)
+ gdk_beep();
}
int CharWidth(Context ctx, int uc)
}
int CharWidth(Context ctx, int uc)
@@
-1297,19
+1354,27
@@
int CharWidth(Context ctx, int uc)
return 1;
}
return 1;
}
-Context get_ctx(void)
+Context get_ctx(void
*frontend
)
{
{
- GdkGC *gc;
+ struct gui_data *inst = (struct gui_data *)frontend;
+ struct draw_ctx *dctx;
+
if (!inst->area->window)
return NULL;
if (!inst->area->window)
return NULL;
- gc = gdk_gc_new(inst->area->window);
- return gc;
+
+ dctx = smalloc(sizeof(*dctx));
+ dctx->inst = inst;
+ dctx->gc = gdk_gc_new(inst->area->window);
+ return dctx;
}
void free_ctx(Context ctx)
{
}
void free_ctx(Context ctx)
{
- GdkGC *gc = (GdkGC *)ctx;
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ /* struct gui_data *inst = dctx->inst; */
+ GdkGC *gc = dctx->gc;
gdk_gc_unref(gc);
gdk_gc_unref(gc);
+ sfree(dctx);
}
/*
}
/*
@@
-1321,8
+1386,11
@@
void free_ctx(Context ctx)
void do_text_internal(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
void do_text_internal(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ struct gui_data *inst = dctx->inst;
+ GdkGC *gc = dctx->gc;
+
int nfg, nbg, t, fontid, shadow;
int nfg, nbg, t, fontid, shadow;
- GdkGC *gc = (GdkGC *)ctx;
/*
* NYI:
/*
* NYI:
@@
-1355,10
+1423,10
@@
void do_text_internal(Context ctx, int x, int y, char *text, int len,
if (lattr != LATTR_NORM) {
x *= 2;
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= term->cols)
+ if (x >=
inst->
term->cols)
return;
return;
- if (x + len*2 > term->cols)
- len = (term->cols-x)/2; /* trim to LH half */
+ if (x + len*2 >
inst->
term->cols)
+ len = (
inst->
term->cols-x)/2; /* trim to LH half */
}
gdk_gc_set_foreground(gc, &inst->cols[nbg]);
}
gdk_gc_set_foreground(gc, &inst->cols[nbg]);
@@
-1431,16
+1499,18
@@
void do_text_internal(Context ctx, int x, int y, char *text, int len,
void do_text(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
void do_text(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
- GdkGC *gc = (GdkGC *)ctx;
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ struct gui_data *inst = dctx->inst;
+ GdkGC *gc = dctx->gc;
do_text_internal(ctx, x, y, text, len, attr, lattr);
if (lattr != LATTR_NORM) {
x *= 2;
do_text_internal(ctx, x, y, text, len, attr, lattr);
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= term->cols)
+ if (x >=
inst->
term->cols)
return;
return;
- if (x + len*2 > term->cols)
- len = (term->cols-x)/2; /* trim to LH half */
+ if (x + len*2 >
inst->
term->cols)
+ len = (
inst->
term->cols-x)/2; /* trim to LH half */
len *= 2;
}
len *= 2;
}
@@
-1455,8
+1525,11
@@
void do_text(Context ctx, int x, int y, char *text, int len,
void do_cursor(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
void do_cursor(Context ctx, int x, int y, char *text, int len,
unsigned long attr, int lattr)
{
+ struct draw_ctx *dctx = (struct draw_ctx *)ctx;
+ struct gui_data *inst = dctx->inst;
+ GdkGC *gc = dctx->gc;
+
int passive;
int passive;
- GdkGC *gc = (GdkGC *)ctx;
if (attr & TATTR_PASCURS) {
attr &= ~TATTR_PASCURS;
if (attr & TATTR_PASCURS) {
attr &= ~TATTR_PASCURS;
@@
-1470,10
+1543,10
@@
void do_cursor(Context ctx, int x, int y, char *text, int len,
if (lattr != LATTR_NORM) {
x *= 2;
if (lattr != LATTR_NORM) {
x *= 2;
- if (x >= term->cols)
+ if (x >=
inst->
term->cols)
return;
return;
- if (x + len*2 > term->cols)
- len = (term->cols-x)/2; /* trim to LH half */
+ if (x + len*2 >
inst->
term->cols)
+ len = (
inst->
term->cols-x)/2; /* trim to LH half */
len *= 2;
}
len *= 2;
}
@@
-1545,7
+1618,7
@@
void do_cursor(Context ctx, int x, int y, char *text, int len,
len*inst->font_width, inst->font_height);
}
len*inst->font_width, inst->font_height);
}
-GdkCursor *make_mouse_ptr(int cursor_val)
+GdkCursor *make_mouse_ptr(
struct gui_data *inst,
int cursor_val)
{
/*
* Truly hideous hack: GTK doesn't allow us to set the mouse
{
/*
* Truly hideous hack: GTK doesn't allow us to set the mouse
@@
-1648,7
+1721,7
@@
void modalfatalbox(char *p, ...)
exit(1);
}
exit(1);
}
-char *get_x_display(void)
+char *get_x_display(void
*frontend
)
{
return gdk_get_display();
}
{
return gdk_get_display();
}
@@
-1821,6
+1894,7
@@
int main(int argc, char **argv)
{
extern int pty_master_fd; /* declared in pty.c */
extern void pty_pre_init(void); /* declared in pty.c */
{
extern int pty_master_fd; /* declared in pty.c */
extern void pty_pre_init(void); /* declared in pty.c */
+ struct gui_data *inst;
pty_pre_init();
pty_pre_init();
@@
-1833,9
+1907,11
@@
int main(int argc, char **argv)
exit(1);
/*
exit(1);
/*
- *
Initialise the whole instance structur
e to zeroes
+ *
Create an instance structure and initialis
e to zeroes
*/
*/
+ inst = smalloc(sizeof(*inst));
memset(inst, 0, sizeof(*inst));
memset(inst, 0, sizeof(*inst));
+ inst->alt_keycode = -1; /* this one needs _not_ to be zero */
inst->fonts[0] = gdk_font_load(cfg.font);
if (!inst->fonts[0]) {
inst->fonts[0] = gdk_font_load(cfg.font);
if (!inst->fonts[0]) {
@@
-1862,14
+1938,14
@@
int main(int argc, char **argv)
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
if (cfg.wintitle[0])
inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
if (cfg.wintitle[0])
- set_title(cfg.wintitle);
+ set_title(
inst,
cfg.wintitle);
else
else
- set_title("pterm");
+ set_title(
inst,
"pterm");
/*
* Set up the colour map.
*/
/*
* Set up the colour map.
*/
- palette_reset();
+ palette_reset(
inst
);
inst->area = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
inst->area = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(inst->area),
@@
-1948,24
+2024,29
@@
int main(int argc, char **argv)
gtk_widget_show(GTK_WIDGET(inst->hbox));
gtk_widget_show(inst->window);
gtk_widget_show(GTK_WIDGET(inst->hbox));
gtk_widget_show(inst->window);
- set_window_background();
+ set_window_background(
inst
);
- inst->textcursor = make_mouse_ptr(GDK_XTERM);
- inst->rawcursor = make_mouse_ptr(GDK_LEFT_PTR);
- inst->blankcursor = make_mouse_ptr(-1);
- make_mouse_ptr(
-2);
/* clean up cursor font */
+ inst->textcursor = make_mouse_ptr(
inst,
GDK_XTERM);
+ inst->rawcursor = make_mouse_ptr(
inst,
GDK_LEFT_PTR);
+ inst->blankcursor = make_mouse_ptr(
inst,
-1);
+ make_mouse_ptr(
inst, -2);
/* clean up cursor font */
inst->currcursor = inst->textcursor;
inst->currcursor = inst->textcursor;
- show_mouseptr(1);
+ show_mouseptr(inst, 1);
+
+ inst->term = term_init(inst);
+ inst->logctx = log_init(inst);
+ term_provide_logctx(inst->term, inst->logctx);
- term = term_init();
+ inst->back = &pty_backend;
+ inst->back->init((void *)inst->term, &inst->backhandle, NULL, 0, NULL, 0);
+ inst->back->provide_logctx(inst->backhandle, inst->logctx);
- back = &pty_backend;
- back->init((void *)term, &backhandle, NULL, 0, NULL, 0);
+ term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
- term_
provide_resize_fn(term, back->size, backhandle
);
+ term_
size(inst->term, cfg.height, cfg.width, cfg.savelines
);
-
term_size(term, cfg.height, cfg.width, cfg.savelines
);
- ldisc_send(
NULL, 0, 0);
/* cause ldisc to notice changes */
+
inst->ldisc = ldisc_create(inst->term, inst->back, inst->backhandle, inst
);
+ ldisc_send(
inst->ldisc, NULL, 0, 0);
/* cause ldisc to notice changes */
inst->master_fd = pty_master_fd;
inst->exited = FALSE;
inst->master_fd = pty_master_fd;
inst->exited = FALSE;