ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.122 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC

… …
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
… …
156#endif 159#endif
157#ifdef USE_XIM 160#ifdef USE_XIM
158 im_ev (this, &rxvt_term::im_cb), 161 im_ev (this, &rxvt_term::im_cb),
159#endif 162#endif
160 sw_term (this, &rxvt_term::sig_term), 163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
161 sw_chld (this, &rxvt_term::sig_chld), 165 sw_chld (this, &rxvt_term::sig_chld),
162 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
164 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 169 flush_ev (this, &rxvt_term::flush_cb),
… …
168 incr_ev (this, &rxvt_term::incr_cb) 172 incr_ev (this, &rxvt_term::incr_cb)
169{ 173{
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 174 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 175
172 termlist.push_back (this); 176 termlist.push_back (this);
173}
174 177
175rxvt_term::~rxvt_term () 178#ifdef KEYSYM_RESOURCE
176{ 179 keyboard = new keyboard_manager;
177 termlist.erase (find (termlist.begin (), termlist.end(), this));
178 180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif
184}
185
186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
189{
179 if (cmd_pid) 190 if (cmd_pid)
180 kill (-cmd_pid, SIGHUP); 191 kill (-cmd_pid, SIGHUP);
181 192
182 pty.put ();
183
184#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
185 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
186#endif 195#endif
196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
187 205
188#if ENABLE_STYLES 206#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; ) 207 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0]) 208 if (TermWin.fontset[i] != TermWin.fontset[0])
191 delete TermWin.fontset[i]; 209 delete TermWin.fontset[i];
192#endif 210#endif
193 delete TermWin.fontset[0]; 211 delete TermWin.fontset[0];
194 212
195 if (display) 213 if (display)
196 { 214 {
215 dDisp;
216
197 selection_clear (); 217 selection_clear ();
198 218
199#ifdef USE_XIM 219#ifdef USE_XIM
200 im_destroy (); 220 im_destroy ();
201#endif 221#endif
202#ifdef MENUBAR 222#ifdef MENUBAR
203 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
204#endif 224#endif
205#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
207 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
208#endif 228#endif
209#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
210 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
211#endif 231#endif
212#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
213 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
214 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
215 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
216 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
217 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
218 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
219 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
220 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
221 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
222 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
223#endif 243#endif
224#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
225 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
226 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
227 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
228#endif 248#endif
229 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
230 250
231#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
232 delete menuBar.drawable; 252 delete menuBar.drawable;
233 //if (menuBar.win) 253 //if (menuBar.win)
234 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
235#endif 255#endif
236 delete TermWin.drawable; 256 delete TermWin.drawable;
237 // destroy all windows 257 // destroy all windows
238 if (TermWin.parent[0]) 258 if (TermWin.parent[0])
239 XDestroyWindow (display->display, TermWin.parent[0]); 259 XDestroyWindow (disp, TermWin.parent[0]);
240 } 260 }
241 261
242 // TODO: free pixcolours, colours should become part of rxvt_display 262 // TODO: free pixcolours, colours should become part of rxvt_display
243 263
244 delete pix_colors_focused; 264 delete pix_colors_focused;
… …
250 270
251 scr_release (); 271 scr_release ();
252 272
253 /* clear all resources */ 273 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]); 275 free (allocated [i]);
256 276
257 free (selection.text); 277 free (selection.text);
258 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
259 free (env_windowid); 279 free (env_windowid);
260 free (env_display); 280 free (env_display);
… …
264 free (v_buffer); 284 free (v_buffer);
265 free (incr_buf); 285 free (incr_buf);
266 286
267 delete envv; 287 delete envv;
268 delete argv; 288 delete argv;
289
290#ifdef KEYSYM_RESOURCE
291 delete keyboard;
292#endif
269} 293}
270 294
271void 295void
272rxvt_term::destroy () 296rxvt_term::destroy ()
273{ 297{
… …
325 349
326 delete this; 350 delete this;
327} 351}
328 352
329/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
354/*
355 * Exit gracefully, clearing the utmp entry and restoring tty attributes
356 * TODO: if debugging, this should free up any known resources if we can
357 */
358static XErrorHandler old_xerror_handler;
359
360static void
361rxvt_emergency_cleanup ()
362{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup ();
365}
366
367int
368rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{
370 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code;
372 else
373 {
374 //TODO: GET_R is most likely not the terminal which caused the error
375 //TODO: maybe just output the error and continue?
376 old_xerror_handler (display, event);
377 GET_R->destroy ();
378 }
379
380 return 0;
381}
382
383int
384rxvt_xioerror_handler (Display *display)
385{
386 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
387 DisplayString (display));
388 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE);
390}
391
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/
330/* rxvt_init () */ 407/* rxvt_init () */
331bool 408bool
332rxvt_term::init (int argc, const char *const *argv) 409rxvt_term::init (int argc, const char *const *argv)
333{ 410{
334 SET_R (this); 411 SET_R (this);
335 412
413 set_locale ("");
414
336 if (!init_vars ()) 415 if (!init_vars ())
337 return false; 416 return false;
338 417
339 init_secondary (); 418 init_secondary ();
340 419
341 const char **cmd_argv = init_resources (argc, argv); 420 const char **cmd_argv = init_resources (argc, argv);
342 421
343 set_locale (""); 422#ifdef KEYSYM_RESOURCE
423 keyboard->register_done ();
424#endif
344 425
345#if MENUBAR_MAX 426#if MENUBAR_MAX
346 menubar_read (rs[Rs_menu]); 427 menubar_read (rs[Rs_menu]);
347#endif 428#endif
348#ifdef HAVE_SCROLLBARS 429#ifdef HAVE_SCROLLBARS
… …
350 scrollBar.setIdle (); /* set existence for size calculations */ 431 scrollBar.setIdle (); /* set existence for size calculations */
351#endif 432#endif
352 433
353 create_windows (argc, argv); 434 create_windows (argc, argv);
354 435
436 dDisp;
437
355 init_xlocale (); 438 init_xlocale ();
356 439
357 scr_reset (); /* initialize screen */ 440 scr_reset (); /* initialize screen */
358 441
359#if 0 442#if 0
360 XSynchronize (display->display, True); 443 XSynchronize (disp, True);
361#endif 444#endif
362 445
363#ifdef HAVE_SCROLLBARS 446#ifdef HAVE_SCROLLBARS
364 if (options & Opt_scrollBar) 447 if (options & Opt_scrollBar)
365 resize_scrollbar (); /* create and map scrollbar */ 448 resize_scrollbar (); /* create and map scrollbar */
366#endif 449#endif
367#if (MENUBAR_MAX) 450#if (MENUBAR_MAX)
368 if (menubar_visible ()) 451 if (menubar_visible ())
369 XMapWindow (display->display, menuBar.win); 452 XMapWindow (disp, menuBar.win);
370#endif 453#endif
371#ifdef TRANSPARENT 454#ifdef TRANSPARENT
372 if (options & Opt_transparent) 455 if (options & Opt_transparent)
373 { 456 {
374 XSelectInput (display->display, display->root, PropertyChangeMask); 457 XSelectInput (disp, display->root, PropertyChangeMask);
375 check_our_parents (); 458 check_our_parents ();
376 rootwin_ev.start (display, display->root); 459 rootwin_ev.start (display, display->root);
377 } 460 }
378#endif 461#endif
379 462
380 XMapWindow (display->display, TermWin.vt); 463 XMapWindow (disp, TermWin.vt);
381 XMapWindow (display->display, TermWin.parent[0]); 464 XMapWindow (disp, TermWin.parent[0]);
382 465
383 set_colorfgbg (); 466 set_colorfgbg ();
384 467
385 init_command (cmd_argv); 468 init_command (cmd_argv);
386 469
470 free (cmd_argv);
471
387 pty_ev.start (pty.pty, EVENT_READ); 472 pty_ev.start (pty.pty, EVENT_READ);
388 473
389 check_ev.start (); 474 check_ev.start ();
390 475
391 return true; 476 return true;
392} 477}
393
394static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
395 478
396void 479void
397rxvt_init () 480rxvt_init ()
398{ 481{
399 /* 482 /*
… …
412 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
413 /* signal (SIGURG, SIG_DFL); */ 496 /* signal (SIGURG, SIG_DFL); */
414 497
415 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
416 // TODO: handle this with exceptions and tolerate the memory loss 499 // TODO: handle this with exceptions and tolerate the memory loss
417 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 500 XSetIOErrorHandler (rxvt_xioerror_handler);
418} 501}
419 502
420/* ------------------------------------------------------------------------- * 503/* ------------------------------------------------------------------------- *
421 * SIGNAL HANDLING & EXIT HANDLER * 504 * SIGNAL HANDLING & EXIT HANDLER *
422 * ------------------------------------------------------------------------- */ 505 * ------------------------------------------------------------------------- */
… …
435 if (pid == (*t)->cmd_pid) 518 if (pid == (*t)->cmd_pid)
436 { 519 {
437 (*t)->destroy (); 520 (*t)->destroy ();
438 break; 521 break;
439 } 522 }
440}
441
442/*----------------------------------------------------------------------*/
443/*
444 * Exit gracefully, clearing the utmp entry and restoring tty attributes
445 * TODO: if debugging, this should free up any known resources if we can
446 */
447void
448rxvt_destroy_all ()
449{
450 // TODO: rxvtd should clean up all ressources
451 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
452 (*t)->destroy ();
453}
454
455/*
456 * Catch a fatal signal and tidy up before quitting
457 */
458void
459rxvt_term::sig_term (sig_watcher &w)
460{
461#ifdef DEBUG_CMD
462 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
463#endif
464 rxvt_destroy_all ();
465 signal (w.signum, SIG_DFL);
466 kill (getpid (), w.signum);
467}
468
469/* INTPROTO */
470int
471rxvt_xerror_handler (Display *display, XErrorEvent *event)
472{
473 if (GET_R->allowedxerror == -1)
474 GET_R->allowedxerror = event->error_code;
475 else
476 {
477 old_xerror_handler (display, event);
478 GET_R->destroy ();
479 }
480
481 return 0;
482} 523}
483 524
484/* ------------------------------------------------------------------------- * 525/* ------------------------------------------------------------------------- *
485 * MEMORY ALLOCATION WRAPPERS * 526 * MEMORY ALLOCATION WRAPPERS *
486 * ------------------------------------------------------------------------- */ 527 * ------------------------------------------------------------------------- */
… …
599 * if width/height are non-zero then override calculated width/height 640 * if width/height are non-zero then override calculated width/height
600 */ 641 */
601void 642void
602rxvt_term::window_calc (unsigned int width, unsigned int height) 643rxvt_term::window_calc (unsigned int width, unsigned int height)
603{ 644{
604 short recalc_x, recalc_y; 645 short recalc_x, recalc_y;
605 int x, y, sb_w, mb_h, flags; 646 int x, y, sb_w, mb_h, flags;
606 unsigned int w, h; 647 unsigned int w, h;
607 unsigned int max_width, max_height; 648 unsigned int max_width, max_height;
649 dDisp;
608 650
609 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
610 TermWin.ncol, TermWin.nrow, szHint.width, 652 TermWin.ncol, TermWin.nrow, szHint.width,
611 szHint.height)); 653 szHint.height));
612 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
710 752
711 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 753 if (scrollbar_visible () && (options & Opt_scrollBar_right))
712 window_sb_x = szHint.width - sb_w; 754 window_sb_x = szHint.width - sb_w;
713 755
714 if (recalc_x) 756 if (recalc_x)
715 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 757 szHint.x += (DisplayWidth (disp, display->screen)
716 - szHint.width - 2 * TermWin.ext_bwidth); 758 - szHint.width - 2 * TermWin.ext_bwidth);
717 if (recalc_y) 759 if (recalc_y)
718 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 760 szHint.y += (DisplayHeight (disp, display->screen)
719 - szHint.height - 2 * TermWin.ext_bwidth); 761 - szHint.height - 2 * TermWin.ext_bwidth);
720 762
721 TermWin.ncol = TermWin.width / TermWin.fwidth; 763 TermWin.ncol = TermWin.width / TermWin.fwidth;
722 TermWin.nrow = TermWin.height / TermWin.fheight; 764 TermWin.nrow = TermWin.height / TermWin.fheight;
723 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
782 824
783 delete TermWin.fontset[0]; 825 delete TermWin.fontset[0];
784 TermWin.fontset[0] = fs; 826 TermWin.fontset[0] = fs;
785 827
786 prop = (*fs)[1]->properties (); 828 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace;
787 fs->set_prop (prop); 830 fs->set_prop (prop);
788 831
789 TermWin.fwidth = prop.width; 832 TermWin.fwidth = prop.width;
790 TermWin.fheight = prop.height; 833 TermWin.fheight = prop.height;
791 TermWin.fweight = prop.weight; 834 TermWin.fweight = prop.weight;
… …
887 930
888 /* handle color aliases */ 931 /* handle color aliases */
889 if (isdigit (*color)) 932 if (isdigit (*color))
890 { 933 {
891 i = atoi (color); 934 i = atoi (color);
935
892 if (i >= 8 && i <= 15) 936 if (i >= 8 && i <= 15)
893 { /* bright colors */ 937 { /* bright colors */
894 i -= 8; 938 i -= 8;
895# ifndef NO_BRIGHTCOLOR 939# ifndef NO_BRIGHTCOLOR
896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
897 SET_PIXCOLOR (idx); 941 SET_PIXCOLOR (idx);
898 goto Done; 942 goto Done;
899# endif 943# endif
900
901 } 944 }
945
902 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
903 { /* normal colors */ 947 { /* normal colors */
904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
905 SET_PIXCOLOR (idx); 949 SET_PIXCOLOR (idx);
906 goto Done; 950 goto Done;
907 } 951 }
908 } 952 }
909 953
910 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (&xcol, color))
911 return; 955 return;
912 956
913 /* XStoreColor (display->display, display->cmap, XColor*); */ 957 /* XStoreColor (display->display, display->cmap, XColor*); */
914 958
915 /* 959 /*
… …
1018 * -------------------------------------------------------------------- */ 1062 * -------------------------------------------------------------------- */
1019void 1063void
1020rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1021{ 1065{
1022 int fix_screen; 1066 int fix_screen;
1023
1024#ifdef SMART_RESIZE 1067#ifdef SMART_RESIZE
1025 int old_width = szHint.width, old_height = szHint.height; 1068 int old_width = szHint.width, old_height = szHint.height;
1026#endif 1069#endif
1070 dDisp;
1027 1071
1028 window_calc (width, height); 1072 window_calc (width, height);
1029 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1030 1074
1031 if (!ignoreparent) 1075 if (!ignoreparent)
1032 { 1076 {
1033#ifdef SMART_RESIZE 1077#ifdef SMART_RESIZE
1034 /* 1078 /*
… …
1038 int x, y, x1, y1; 1082 int x, y, x1, y1;
1039 int dx, dy; 1083 int dx, dy;
1040 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1041 Window unused_cr; 1085 Window unused_cr;
1042 1086
1043 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1044 0, 0, &x, &y, &unused_cr); 1088 0, 0, &x, &y, &unused_cr);
1045 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1046 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1047 /* 1091 /*
1048 * if display->root isn't the parent window, a WM will probably have offset 1092 * if display->root isn't the parent window, a WM will probably have offset
1049 * our position for handles and decorations. Counter it 1093 * our position for handles and decorations. Counter it
1050 */ 1094 */
… …
1052 { 1096 {
1053 x -= x1; 1097 x -= x1;
1054 y -= y1; 1098 y -= y1;
1055 } 1099 }
1056 1100
1057 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1101 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1058 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1102 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1059 dx = old_width - szHint.width; 1103 dx = old_width - szHint.width;
1060 dy = old_height - szHint.height; 1104 dy = old_height - szHint.height;
1061 1105
1062 /* Check position of the center of the window */ 1106 /* Check position of the center of the window */
1063 if (x < x1) /* left half */ 1107 if (x < x1) /* left half */
… …
1067 if (y < y1) /* top half */ 1111 if (y < y1) /* top half */
1068 dy = 0; 1112 dy = 0;
1069 else if (y == y1) /* exact center */ 1113 else if (y == y1) /* exact center */
1070 dy /= 2; 1114 dy /= 2;
1071 1115
1072 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1073 szHint.width, szHint.height); 1117 szHint.width, szHint.height);
1074#else 1118#else
1075 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1076#endif 1120#endif
1077 } 1121 }
1078 1122
1079 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1080 1124
1081 if (fix_screen || width != old_width || height != old_height) 1125 if (fix_screen || width != old_width || height != old_height)
1082 { 1126 {
1083 if (scrollbar_visible ()) 1127 if (scrollbar_visible ())
1084 { 1128 {
1085 XMoveResizeWindow (display->display, scrollBar.win, 1129 XMoveResizeWindow (disp, scrollBar.win,
1086 window_sb_x, 0, 1130 window_sb_x, 0,
1087 scrollbar_TotalWidth (), szHint.height); 1131 scrollbar_TotalWidth (), szHint.height);
1088 resize_scrollbar (); 1132 resize_scrollbar ();
1089 } 1133 }
1090 1134
1091 if (menubar_visible ()) 1135 if (menubar_visible ())
1092 XMoveResizeWindow (display->display, menuBar.win, 1136 XMoveResizeWindow (disp, menuBar.win,
1093 window_vt_x, 0, 1137 window_vt_x, 0,
1094 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1138 TermWin_TotalWidth (), menuBar_TotalHeight ());
1095 1139
1096 XMoveResizeWindow (display->display, TermWin.vt, 1140 XMoveResizeWindow (disp, TermWin.vt,
1097 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1098 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1142 TermWin_TotalWidth (), TermWin_TotalHeight ());
1143
1099 scr_clear (); 1144 scr_clear ();
1100#ifdef XPM_BACKGROUND 1145#ifdef XPM_BACKGROUND
1101 resize_pixmap (); 1146 resize_pixmap ();
1102#endif 1147#endif
1103 } 1148 }
… …
1125 } 1170 }
1126 } 1171 }
1127 1172
1128 old_width = szHint.width; 1173 old_width = szHint.width;
1129 old_height = szHint.height; 1174 old_height = szHint.height;
1175
1176#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap)
1178 scr_touch (false);
1179#endif
1130 1180
1131#ifdef USE_XIM 1181#ifdef USE_XIM
1132 IMSetStatusPosition (); 1182 IMSetStatusPosition ();
1133#endif 1183#endif
1134} 1184}
… …
1364 "*", 1414 "*",
1365 TermWin.fheight, 1415 TermWin.fheight,
1366 TermWin.fheight + 1, TermWin.fheight - 1, 1416 TermWin.fheight + 1, TermWin.fheight - 1,
1367 TermWin.fheight - 2, TermWin.fheight + 2); 1417 TermWin.fheight - 2, TermWin.fheight + 2);
1368 1418
1369 fs = XCreateFontSet (display->display, pat, 1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1370 &missing_charset_list, &missing_charset_count, &def_string); 1420 &missing_charset_list, &missing_charset_count, &def_string);
1371 1421
1372 if (missing_charset_list) 1422 if (missing_charset_list)
1373 XFreeStringList (missing_charset_list); 1423 XFreeStringList (missing_charset_list);
1374 1424

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines