nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-04 14:12:24 +00:00
Code Issues Projects Releases Wiki Activity

While writing gtkdlg.c I learned how to specify a window's initial

Browse Source 
position in GTK, so I can now implement the other half of -geometry
which I'd previously believed to be impossible in GTK. It's still
not perfect, because GTK apparently provides no way for us to get
hold of the X reparent event in order to support negative geometries
in a manner which takes account of the WM borders; but for positive
position it's at least an improvement on the previous version!

[originally from svn r3078]
This commit is contained in:
Simon Tatham 2003-04-08 13:49:12 +00:00
parent b0ee81ab32
commit fe666b2432
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
unix/pterm.c
View File

@ -45,6 +45,7 @@ struct gui_data {
int charset; int charset;
int is_wide; int is_wide;
} fontinfo[4]; } fontinfo[4];
int xpos, ypos, gotpos, gravity;
GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor; GdkCursor *rawcursor, *textcursor, *blankcursor, *currcursor;
GdkColor cols[NCOLOURS]; GdkColor cols[NCOLOURS];
GdkColormap *colmap; GdkColormap *colmap;
@ -1980,7 +1981,7 @@ static void help(FILE *fp) {
" -name PREFIX Prefix when looking up resources (default: pterm)\n" " -name PREFIX Prefix when looking up resources (default: pterm)\n"
" -fn FONT Normal text font\n" " -fn FONT Normal text font\n"
" -fb FONT Bold text font\n" " -fb FONT Bold text font\n"
" -geometry WIDTHxHEIGHT Size of terminal in characters\n" " -geometry GEOMETRY Position and size of window (size in characters)\n"
" -sl LINES Number of lines of scrollback\n" " -sl LINES Number of lines of scrollback\n"
" -fg COLOUR, -bg COLOUR Foreground/background colour\n" " -fg COLOUR, -bg COLOUR Foreground/background colour\n"
" -bfg COLOUR, -bbg COLOUR Foreground/background bold colour\n" " -bfg COLOUR, -bbg COLOUR Foreground/background bold colour\n"
@ -1999,7 +2000,8 @@ static void help(FILE *fp) {
} }
} }
int do_cmdline(int argc, char **argv, int do_everything, Config *cfg) int do_cmdline(int argc, char **argv, int do_everything,
struct gui_data *inst, Config *cfg)
{ {
int err = 0; int err = 0;
extern char **pty_argv; /* declared in pty.c */ extern char **pty_argv; /* declared in pty.c */
@ -2023,12 +2025,6 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
} }
#define SECOND_PASS_ONLY { if (!do_everything) continue; } #define SECOND_PASS_ONLY { if (!do_everything) continue; }
/*
* TODO:
*
* finish -geometry
*/
char *val; char *val;
while (--argc > 0) { while (--argc > 0) {
char *p = *++argv; char *p = *++argv;
@ -2087,13 +2083,13 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
if (flags & HeightValue) if (flags & HeightValue)
cfg->height = h; cfg->height = h;
/* if (flags & (XValue | YValue)) {
* Apparently setting the initial window position is inst->xpos = x;
* difficult in GTK 1.2. Not entirely sure why this inst->ypos = y;
* should be. 2.0 has gtk_window_parse_geometry(), inst->gotpos = TRUE;
* which would help... For the moment, though, I can't inst->gravity = ((flags & XNegative ? 1 : 0) |
* be bothered with this. (flags & YNegative ? 2 : 0));
*/ }
} else if (!strcmp(p, "-sl")) { } else if (!strcmp(p, "-sl")) {
EXPECTS_ARG; EXPECTS_ARG;
@ -2373,10 +2369,10 @@ int pt_main(int argc, char **argv)
memset(inst, 0, sizeof(*inst)); memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */ inst->alt_keycode = -1; /* this one needs _not_ to be zero */
if (do_cmdline(argc, argv, 0, &inst->cfg)) if (do_cmdline(argc, argv, 0, inst, &inst->cfg))
exit(1); /* pre-defaults pass to get -class */ exit(1); /* pre-defaults pass to get -class */
do_defaults(NULL, &inst->cfg); do_defaults(NULL, &inst->cfg);
if (do_cmdline(argc, argv, 1, &inst->cfg)) if (do_cmdline(argc, argv, 1, inst, &inst->cfg))
exit(1); /* post-defaults, do everything */ exit(1); /* post-defaults, do everything */
cmdline_run_saved(&inst->cfg); cmdline_run_saved(&inst->cfg);
@ -2472,6 +2468,21 @@ int pt_main(int argc, char **argv)
GDK_HINT_RESIZE_INC); GDK_HINT_RESIZE_INC);
} }
gtk_widget_show(inst->area);
if (inst->cfg.scrollbar)
gtk_widget_show(inst->sbar);
gtk_widget_show(GTK_WIDGET(inst->hbox));
if (inst->gotpos) {
int x = inst->xpos, y = inst->ypos;
GtkRequisition req;
gtk_widget_size_request(GTK_WIDGET(inst->window), &req);
if (inst->gravity & 1) x += gdk_screen_width() - req.width;
if (inst->gravity & 2) y += gdk_screen_height() - req.height;
gtk_window_set_position(GTK_WINDOW(inst->window), GTK_WIN_POS_NONE);
gtk_widget_set_uposition(GTK_WIDGET(inst->window), x, y);
}
gtk_signal_connect(GTK_OBJECT(inst->window), "destroy", gtk_signal_connect(GTK_OBJECT(inst->window), "destroy",
GTK_SIGNAL_FUNC(destroy), inst); GTK_SIGNAL_FUNC(destroy), inst);
gtk_signal_connect(GTK_OBJECT(inst->window), "delete_event", gtk_signal_connect(GTK_OBJECT(inst->window), "delete_event",
@ -2509,10 +2520,6 @@ int pt_main(int argc, char **argv)
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK); GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK);
gtk_widget_show(inst->area);
if (inst->cfg.scrollbar)
gtk_widget_show(inst->sbar);
gtk_widget_show(GTK_WIDGET(inst->hbox));
gtk_widget_show(inst->window); gtk_widget_show(inst->window);
set_window_background(inst); set_window_background(inst);