~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't log every keypress by default here either.
[sgt/putty]
/
unix
/
pterm.c
diff --git
a/unix/pterm.c
b/unix/pterm.c
index
c207195
..
016ef21
100644
(file)
--- a/
unix/pterm.c
+++ b/
unix/pterm.c
@@
-80,7
+80,7
@@
static int send_raw_mouse;
static char *app_name = "pterm";
static char *app_name = "pterm";
-char *x_get_default(char *key)
+char *x_get_default(c
onst c
har *key)
{
return XGetDefault(GDK_DISPLAY(), app_name, key);
}
{
return XGetDefault(GDK_DISPLAY(), app_name, key);
}
@@
-88,17
+88,17
@@
char *x_get_default(char *key)
/*
* Default settings that are specific to pterm.
*/
/*
* Default settings that are specific to pterm.
*/
-char *platform_default_s(char *name)
+char *platform_default_s(c
onst c
har *name)
{
if (!strcmp(name, "Font"))
{
if (!strcmp(name, "Font"))
- return "fixed";
/* COE_NORMAL works badly in an xterm */
+ return "fixed";
return NULL;
}
return NULL;
}
-int platform_default_i(char *name, int def)
+int platform_default_i(c
onst c
har *name, int def)
{
if (!strcmp(name, "CloseOnExit"))
{
if (!strcmp(name, "CloseOnExit"))
- return
COE_ALWAYS; /* COE_NORMAL
works badly in an xterm */
+ return
FORCE_ON; /* AUTO
works badly in an xterm */
return def;
}
return def;
}
@@
-151,7
+151,7
@@
int font_dimension(void *frontend, 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(void *frontend,
Mouse_Button button)
+
static Mouse_Button translate_button(
Mouse_Button button)
{
/* struct gui_data *inst = (struct gui_data *)frontend; */
{
/* struct gui_data *inst = (struct gui_data *)frontend; */
@@
-937,7
+937,8
@@
gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
x = (event->x - inst->cfg.window_border) / inst->font_width;
y = (event->y - inst->cfg.window_border) / inst->font_height;
x = (event->x - inst->cfg.window_border) / inst->font_width;
y = (event->y - inst->cfg.window_border) / inst->font_height;
- term_mouse(inst->term, button, act, x, y, shift, ctrl, alt);
+ term_mouse(inst->term, button, translate_button(button), act,
+ x, y, shift, ctrl, alt);
return TRUE;
}
return TRUE;
}
@@
-964,7
+965,8
@@
gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
x = (event->x - inst->cfg.window_border) / inst->font_width;
y = (event->y - inst->cfg.window_border) / inst->font_height;
x = (event->x - inst->cfg.window_border) / inst->font_width;
y = (event->y - inst->cfg.window_border) / inst->font_height;
- term_mouse(inst->term, button, MA_DRAG, x, y, shift, ctrl, alt);
+ term_mouse(inst->term, button, translate_button(button), MA_DRAG,
+ x, y, shift, ctrl, alt);
return TRUE;
}
return TRUE;
}
@@
-989,8
+991,8
@@
void done_with_pty(struct gui_data *inst)
* Terminate now, if the Close On Exit setting is
* appropriate.
*/
* Terminate now, if the Close On Exit setting is
* appropriate.
*/
- if (inst->cfg.close_on_exit ==
COE_ALWAYS
||
- (inst->cfg.close_on_exit ==
COE_NORMAL
&& clean))
+ if (inst->cfg.close_on_exit ==
FORCE_ON
||
+ (inst->cfg.close_on_exit ==
AUTO
&& clean))
exit(0);
/*
exit(0);
/*
@@
-1540,17
+1542,19
@@
void do_text_internal(Context ctx, int x, int y, char *text, int len,
int nfg, nbg, t, fontid, shadow, rlen, widefactor;
int nfg, nbg, t, fontid, shadow, rlen, widefactor;
- nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
- nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+ nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+ nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
+ nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+ nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
if (attr & ATTR_REVERSE) {
t = nfg;
nfg = nbg;
nbg = t;
}
if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
if (attr & ATTR_REVERSE) {
t = nfg;
nfg = nbg;
nbg = t;
}
if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
- nfg
++
;
+ nfg
|= 1
;
if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
- nbg
++
;
+ nbg
|= 1
;
if (attr & TATTR_ACTCURS) {
nfg = NCOLOURS-2;
nbg = NCOLOURS-1;
if (attr & TATTR_ACTCURS) {
nfg = NCOLOURS-2;
nbg = NCOLOURS-1;