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.132 by root, Thu Feb 3 07:18:30 2005 UTC vs.
Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
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 "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
53 52
54static char curlocale[128]; 53static char curlocale[128], savelocale[128];
55 54
56bool 55bool
57rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
58{ 57{
59 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 59 return false;
61 60
62 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
64 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
65} 77}
66 78
67#if ENABLE_COMBINING 79#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
69 81
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 171#endif
160#ifdef USE_XIM 172#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
162#endif 174#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
166 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 178 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
… …
181 if (!keyboard) 190 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n"); 191 rxvt_fatal ("out of memory, aborting.\n");
183#endif 192#endif
184} 193}
185 194
186rxvt_term::~rxvt_term () 195// clean up the most important stuff, do *not* call x or free mem etc.
196// for use before an emergency exit
197void rxvt_term::emergency_cleanup ()
187{ 198{
188 termlist.erase (find (termlist.begin (), termlist.end(), this));
189
190 if (cmd_pid) 199 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 200 kill (-cmd_pid, SIGHUP);
192 201
193#ifdef UTMP_SUPPORT 202#ifdef UTMP_SUPPORT
194 privileged_utmp (RESTORE); 203 privileged_utmp (RESTORE);
195#endif 204#endif
196 205
197 pty.put (); 206 pty.put ();
207}
208
209rxvt_term::~rxvt_term ()
210{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this));
214
215 emergency_cleanup ();
198 216
199#if ENABLE_STYLES 217#if ENABLE_STYLES
200 for (int i = RS_styleCount; --i; ) 218 for (int i = RS_styleCount; --i; )
201 if (TermWin.fontset[i] != TermWin.fontset[0]) 219 if (fontset[i] != fontset[0])
202 delete TermWin.fontset[i]; 220 delete fontset[i];
203#endif 221#endif
204 delete TermWin.fontset[0]; 222 delete fontset[0];
205 223
206 if (display) 224 if (display)
207 { 225 {
226 dDisp;
227
208 selection_clear (); 228 selection_clear ();
209 229
210#ifdef USE_XIM 230#ifdef USE_XIM
211 im_destroy (); 231 im_destroy ();
212#endif 232#endif
213#ifdef MENUBAR 233#ifdef MENUBAR
214 if (menubarGC) XFreeGC (display->display, menubarGC); 234 if (menubarGC) XFreeGC (disp, menubarGC);
215#endif 235#endif
216#ifdef XTERM_SCROLLBAR 236#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
218 if (ShadowGC) XFreeGC (display->display, ShadowGC); 238 if (ShadowGC) XFreeGC (disp, ShadowGC);
219#endif 239#endif
220#ifdef PLAIN_SCROLLBAR 240#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
222#endif 242#endif
223#ifdef NEXT_SCROLLBAR 243#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (display->display, blackGC); 244 if (blackGC) XFreeGC (disp, blackGC);
225 if (whiteGC) XFreeGC (display->display, whiteGC); 245 if (whiteGC) XFreeGC (disp, whiteGC);
226 if (grayGC) XFreeGC (display->display, grayGC); 246 if (grayGC) XFreeGC (disp, grayGC);
227 if (darkGC) XFreeGC (display->display, darkGC); 247 if (darkGC) XFreeGC (disp, darkGC);
228 if (stippleGC) XFreeGC (display->display, stippleGC); 248 if (stippleGC) XFreeGC (disp, stippleGC);
229 if (dimple) XFreePixmap (display->display, dimple); 249 if (dimple) XFreePixmap (disp, dimple);
230 if (upArrow) XFreePixmap (display->display, upArrow); 250 if (upArrow) XFreePixmap (disp, upArrow);
231 if (downArrow) XFreePixmap (display->display, downArrow); 251 if (downArrow) XFreePixmap (disp, downArrow);
232 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 252 if (upArrowHi) XFreePixmap (disp, upArrowHi);
233 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 253 if (downArrowHi) XFreePixmap (disp, downArrowHi);
234#endif 254#endif
235#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
236 if (topShadowGC) XFreeGC (display->display, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
237 if (botShadowGC) XFreeGC (display->display, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
238 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
239#endif 259#endif
240 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
241 261
242#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
243 delete menuBar.drawable; 263 delete menuBar.drawable;
244 //if (menuBar.win) 264 //if (menuBar.win)
245 // XDestroyWindow (display->display, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
246#endif 266#endif
247 delete TermWin.drawable; 267 delete drawable;
248 // destroy all windows 268 // destroy all windows
249 if (TermWin.parent[0]) 269 if (parent[0])
250 XDestroyWindow (display->display, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
251 } 271 }
252 272
253 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
254 274
255 delete pix_colors_focused; 275 delete pix_colors_focused;
256#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
257 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
278#endif
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
258#endif 281#endif
259 282
260 displays.put (display); 283 displays.put (display);
261 284
262 scr_release (); 285 scr_release ();
263 286
264 /* clear all resources */ 287 /* clear all resources */
265 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
266 free (allocated[i]); 289 free (allocated [i]);
267 290
268 free (selection.text); 291 free (selection.text);
269 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
270 free (env_windowid); 293 free (env_windowid);
271 free (env_display); 294 free (env_display);
… …
277 300
278 delete envv; 301 delete envv;
279 delete argv; 302 delete argv;
280 303
281#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
282 delete keyboard; 305 delete keyboard;
283#endif 306#endif
307}
308
309void
310rxvt_term::child_exit ()
311{
312 cmd_pid = 0;
313
314 if (!OPTION (Opt_hold))
315 destroy ();
284} 316}
285 317
286void 318void
287rxvt_term::destroy () 319rxvt_term::destroy ()
288{ 320{
… …
340 372
341 delete this; 373 delete this;
342} 374}
343 375
344/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
345/* rxvt_init () */ 377/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */
381static XErrorHandler old_xerror_handler;
382
383static void
384rxvt_emergency_cleanup ()
385{
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup ();
388}
389
390#if ENABLE_FRILLS
391static void
392print_x_error (Display *dpy, XErrorEvent *event)
393{
394 char buffer[BUFSIZ];
395 char mesg[BUFSIZ];
396 char number[32];
397 char *mtype = "XlibMessage";
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occured, trying to continue after report.\n");
401 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 }
412 if ((event->error_code == BadWindow) ||
413 (event->error_code == BadPixmap) ||
414 (event->error_code == BadCursor) ||
415 (event->error_code == BadFont) ||
416 (event->error_code == BadDrawable) ||
417 (event->error_code == BadColor) ||
418 (event->error_code == BadGC) ||
419 (event->error_code == BadIDChoice) ||
420 (event->error_code == BadValue) ||
421 (event->error_code == BadAtom)) {
422 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
427 mesg, BUFSIZ);
428 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438
439int
440rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{
442 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code;
444 else
445 {
446 // GET_R is most likely not the terminal which caused the error,
447 // so just output the error and continue
448#if ENABLE_FRILLS
449 print_x_error (display, event);
450#else
451 old_xerror_handler (display, event);
452#endif
453 }
454
455 return 0;
456}
457
458int
459rxvt_xioerror_handler (Display *display)
460{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display));
463 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE);
465}
466
467/*----------------------------------------------------------------------*/
346bool 468bool
347rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv)
348{ 470{
349 SET_R (this); 471 SET_R (this);
350 472
… …
363 485
364#if MENUBAR_MAX 486#if MENUBAR_MAX
365 menubar_read (rs[Rs_menu]); 487 menubar_read (rs[Rs_menu]);
366#endif 488#endif
367#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
368 if (options & Opt_scrollBar) 490 if (OPTION (Opt_scrollBar))
369 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
370#endif 492#endif
371 493
494#if ENABLE_PERL
495 if (!rs[Rs_perl_ext_1])
496 rs[Rs_perl_ext_1] = "default";
497
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 {
502 rxvt_perl.init ();
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 }
505#endif
506
372 create_windows (argc, argv); 507 create_windows (argc, argv);
373 508
509 dDisp;
510
374 init_xlocale (); 511 init_xlocale ();
375 512
376 scr_reset (); /* initialize screen */ 513 scr_reset (); /* initialize screen */
377 514
378#if 0 515#if 0
379 XSynchronize (display->display, True); 516 XSynchronize (disp, True);
380#endif 517#endif
381 518
382#ifdef HAVE_SCROLLBARS 519#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar) 520 if (OPTION (Opt_scrollBar))
384 resize_scrollbar (); /* create and map scrollbar */ 521 resize_scrollbar (); /* create and map scrollbar */
385#endif 522#endif
386#if (MENUBAR_MAX) 523#if (MENUBAR_MAX)
387 if (menubar_visible ()) 524 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win); 525 XMapWindow (disp, menuBar.win);
389#endif 526#endif
390#ifdef TRANSPARENT 527#ifdef TRANSPARENT
391 if (options & Opt_transparent) 528 if (OPTION (Opt_transparent))
392 { 529 {
393 XSelectInput (display->display, display->root, PropertyChangeMask); 530 XSelectInput (disp, display->root, PropertyChangeMask);
394 check_our_parents (); 531 check_our_parents ();
395 rootwin_ev.start (display, display->root); 532 rootwin_ev.start (display, display->root);
396 } 533 }
397#endif 534#endif
398 535
399 XMapWindow (display->display, TermWin.vt); 536 XMapWindow (disp, vt);
400 XMapWindow (display->display, TermWin.parent[0]); 537 XMapWindow (disp, parent[0]);
401 538
402 set_colorfgbg (); 539 set_colorfgbg ();
403 540
404 init_command (cmd_argv); 541 init_command (cmd_argv);
405 542
406 free (cmd_argv); 543 free (cmd_argv);
407 544
545 if (pty.pty >= 0)
408 pty_ev.start (pty.pty, EVENT_READ); 546 pty_ev.start (pty.pty, EVENT_READ);
409 547
410 check_ev.start (); 548 check_ev.start ();
411 549
550 HOOK_INVOKE ((this, HOOK_START, DT_END));
551
412 return true; 552 return true;
413} 553}
414 554
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 555static struct sig_handlers
556{
557 sig_watcher sw_chld, sw_term, sw_int;
558
559 void sig_chld (sig_watcher &w)
560 {
561 // we are being called for every SIGCHLD, find the corresponding term
562 int pid;
563
564 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
565 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
566 if (pid == (*t)->cmd_pid)
567 {
568 (*t)->child_exit ();
569 break;
570 }
571 }
572
573 /*
574 * Catch a fatal signal and tidy up before quitting
575 */
576 void
577 sig_term (sig_watcher &w)
578 {
579#ifdef DEBUG_CMD
580 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
581#endif
582 rxvt_emergency_cleanup ();
583 signal (w.signum, SIG_DFL);
584 kill (getpid (), w.signum);
585 }
586
587 sig_handlers ()
588 : sw_chld (this, &sig_handlers::sig_chld),
589 sw_term (this, &sig_handlers::sig_term),
590 sw_int (this, &sig_handlers::sig_term)
591 {
592 }
593} sig_handlers;
416 594
417void 595void
418rxvt_init () 596rxvt_init ()
419{ 597{
420 /* 598 /*
… …
428 rxvt_privileges (IGNORE); 606 rxvt_privileges (IGNORE);
429 607
430 signal (SIGHUP, SIG_IGN); 608 signal (SIGHUP, SIG_IGN);
431 signal (SIGPIPE, SIG_IGN); 609 signal (SIGPIPE, SIG_IGN);
432 610
611 sig_handlers.sw_chld.start (SIGCHLD);
612 sig_handlers.sw_term.start (SIGTERM);
613 sig_handlers.sw_int.start (SIGINT);
614
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 615 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */ 616 /* signal (SIGURG, SIG_DFL); */
435 617
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
439}
440 621
441/* ------------------------------------------------------------------------- * 622#ifdef USE_XGETDEFAULT
442 * SIGNAL HANDLING & EXIT HANDLER * 623 XrmInitialize ();
443 * ------------------------------------------------------------------------- */
444/*
445 * Catch a SIGCHLD signal and exit if the direct child has died
446 */
447
448void
449rxvt_term::sig_chld (sig_watcher &w)
450{
451 // we are being called for every SIGCHLD, not just ours
452 int pid;
453
454 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
455 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
456 if (pid == (*t)->cmd_pid)
457 {
458 (*t)->destroy ();
459 break;
460 }
461}
462
463/*----------------------------------------------------------------------*/
464/*
465 * Exit gracefully, clearing the utmp entry and restoring tty attributes
466 * TODO: if debugging, this should free up any known resources if we can
467 */
468void
469rxvt_destroy_all ()
470{
471 // TODO: rxvtd should clean up all ressources
472 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
473 (*t)->destroy ();
474}
475
476/*
477 * Catch a fatal signal and tidy up before quitting
478 */
479void
480rxvt_term::sig_term (sig_watcher &w)
481{
482#ifdef DEBUG_CMD
483 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
484#endif 624#endif
485 rxvt_destroy_all ();
486 signal (w.signum, SIG_DFL);
487 kill (getpid (), w.signum);
488}
489
490/* INTPROTO */
491int
492rxvt_xerror_handler (Display *display, XErrorEvent *event)
493{
494 if (GET_R->allowedxerror == -1)
495 GET_R->allowedxerror = event->error_code;
496 else
497 {
498 old_xerror_handler (display, event);
499 GET_R->destroy ();
500 }
501
502 return 0;
503} 625}
504 626
505/* ------------------------------------------------------------------------- * 627/* ------------------------------------------------------------------------- *
506 * MEMORY ALLOCATION WRAPPERS * 628 * MEMORY ALLOCATION WRAPPERS *
507 * ------------------------------------------------------------------------- */ 629 * ------------------------------------------------------------------------- */
… …
514 rxvt_fatal ("memory allocation failure. aborting.\n"); 636 rxvt_fatal ("memory allocation failure. aborting.\n");
515 637
516 return p; 638 return p;
517} 639}
518 640
519/* INTPROTO */ 641void *
520void *
521rxvt_calloc (size_t number, size_t size) 642rxvt_calloc (size_t number, size_t size)
522{ 643{
523 void *p = calloc (number, size); 644 void *p = calloc (number, size);
524 645
525 if (!p) 646 if (!p)
526 rxvt_fatal ("memory allocation failure. aborting.\n"); 647 rxvt_fatal ("memory allocation failure. aborting.\n");
527 648
528 return p; 649 return p;
529} 650}
530 651
531/* INTPROTO */
532void * 652void *
533rxvt_realloc (void *ptr, size_t size) 653rxvt_realloc (void *ptr, size_t size)
534{ 654{
535 void *p = realloc (ptr, size); 655 void *p = realloc (ptr, size);
536 656
… …
597 717
598#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
599void 719void
600rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
601{ 721{
602 if ((options & Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit)
603 || !pty.name || !*pty.name) 723 || !pty.name || !*pty.name)
604 return; 724 return;
605 725
606 rxvt_privileges (RESTORE); 726 rxvt_privileges (RESTORE);
607 727
… …
618/* 738/*
619 * window size/position calculcations for XSizeHint and other storage. 739 * window size/position calculcations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 740 * if width/height are non-zero then override calculated width/height
621 */ 741 */
622void 742void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 744{
625 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, mb_h, flags;
627 unsigned int w, h; 747 unsigned int w, h;
628 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
749 dDisp;
629 750
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 752 ncol, nrow, szHint.width, szHint.height));
632 szHint.height)); 753
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
634 szHint.win_gravity = NorthWestGravity; 755 szHint.win_gravity = NorthWestGravity;
635 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
636 757
637 recalc_x = recalc_y = 0; 758 recalc_x = recalc_y = 0;
638 flags = 0; 759 flags = 0;
760
639 if (!parsed_geometry) 761 if (!parsed_geometry)
640 { 762 {
641 parsed_geometry = 1; 763 parsed_geometry = 1;
764
642 if (rs[Rs_geometry]) 765 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 766 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
767
644 if (flags & WidthValue) 768 if (flags & WidthValue)
645 { 769 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 770 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
647 szHint.flags |= USSize; 771 szHint.flags |= USSize;
648 } 772 }
773
649 if (flags & HeightValue) 774 if (flags & HeightValue)
650 { 775 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 776 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 777 szHint.flags |= USSize;
653 } 778 }
779
654 if (flags & XValue) 780 if (flags & XValue)
655 { 781 {
656 szHint.x = x; 782 szHint.x = x;
657 szHint.flags |= USPosition; 783 szHint.flags |= USPosition;
784
658 if (flags & XNegative) 785 if (flags & XNegative)
659 { 786 {
660 recalc_x = 1; 787 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 788 szHint.win_gravity = NorthEastGravity;
662 } 789 }
663 } 790 }
791
664 if (flags & YValue) 792 if (flags & YValue)
665 { 793 {
666 szHint.y = y; 794 szHint.y = y;
667 szHint.flags |= USPosition; 795 szHint.flags |= USPosition;
796
668 if (flags & YNegative) 797 if (flags & YNegative)
669 { 798 {
670 recalc_y = 1; 799 recalc_y = 1;
800
671 if (szHint.win_gravity == NorthEastGravity) 801 if (szHint.win_gravity == NorthEastGravity)
672 szHint.win_gravity = SouthEastGravity; 802 szHint.win_gravity = SouthEastGravity;
673 else 803 else
674 szHint.win_gravity = SouthWestGravity; 804 szHint.win_gravity = SouthWestGravity;
675 } 805 }
676 } 806 }
677 } 807 }
678 808
679 /* TODO: BOUNDS */ 809 /* TODO: BOUNDS */
680 TermWin.width = TermWin.ncol * TermWin.fwidth; 810 width = ncol * fwidth;
681 TermWin.height = TermWin.nrow * TermWin.fheight; 811 height = nrow * fheight;
682 max_width = MAX_COLS * TermWin.fwidth; 812 max_width = MAX_COLS * fwidth;
683 max_height = MAX_ROWS * TermWin.fheight; 813 max_height = MAX_ROWS * fheight;
684 814
685 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
686 816
687 sb_w = mb_h = 0; 817 sb_w = mb_h = 0;
688 window_vt_x = window_vt_y = TermWin.int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
689 819
690 if (scrollbar_visible ()) 820 if (scrollbar_visible ())
691 { 821 {
692 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
693 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
694 if (!(options & Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
695 window_vt_x += sb_w; 825 window_vt_x += sb_w;
696 } 826 }
697 827
698 if (menubar_visible ()) 828 if (menubar_visible ())
699 { 829 {
700 mb_h = menuBar_TotalHeight (); 830 mb_h = menuBar_TotalHeight ();
701 szHint.base_height += mb_h; 831 szHint.base_height += mb_h;
702 window_vt_y += mb_h; 832 window_vt_y += mb_h;
703 } 833 }
704 834
705 szHint.width_inc = TermWin.fwidth; 835 szHint.width_inc = fwidth;
706 szHint.height_inc = TermWin.fheight; 836 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 837 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 838 szHint.min_height = szHint.base_height + szHint.height_inc;
709 839
710 if (width && width - szHint.base_width < max_width) 840 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 841 {
712 szHint.width = width; 842 szHint.width = newwidth;
713 TermWin.width = width - szHint.base_width; 843 width = newwidth - szHint.base_width;
714 } 844 }
715 else 845 else
716 { 846 {
717 MIN_IT (TermWin.width, max_width); 847 min_it (width, max_width);
718 szHint.width = szHint.base_width + TermWin.width; 848 szHint.width = szHint.base_width + width;
719 } 849 }
720 850
721 if (height && height - szHint.base_height < max_height) 851 if (newheight && newheight - szHint.base_height < max_height)
722 { 852 {
723 szHint.height = height; 853 szHint.height = newheight;
724 TermWin.height = height - szHint.base_height; 854 height = newheight - szHint.base_height;
725 } 855 }
726 else 856 else
727 { 857 {
728 MIN_IT (TermWin.height, max_height); 858 min_it (height, max_height);
729 szHint.height = szHint.base_height + TermWin.height; 859 szHint.height = szHint.base_height + height;
730 } 860 }
731 861
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 863 window_sb_x = szHint.width - sb_w;
734 864
735 if (recalc_x) 865 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
737 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 867 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 868 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
740 - szHint.height - 2 * TermWin.ext_bwidth);
741 869
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 870 ncol = width / fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 871 nrow = height / fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 872 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745 TermWin.ncol, TermWin.nrow, szHint.width, 873 ncol, nrow, szHint.width,
746 szHint.height)); 874 szHint.height));
747 return; 875 return;
748} 876}
749 877
750/*----------------------------------------------------------------------*/ 878/*----------------------------------------------------------------------*/
… …
758 if (pty.pty < 0) 886 if (pty.pty < 0)
759 return; 887 return;
760 888
761 struct winsize ws; 889 struct winsize ws;
762 890
763 ws.ws_col = TermWin.ncol; 891 ws.ws_col = ncol;
764 ws.ws_row = TermWin.nrow; 892 ws.ws_row = nrow;
765 ws.ws_xpixel = TermWin.width; 893 ws.ws_xpixel = width;
766 ws.ws_ypixel = TermWin.height; 894 ws.ws_ypixel = height;
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
768 896
769#if 0 897#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 899 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 900 kill (-cmd_pid, SIGWINCH);
773#endif 901#endif
774} 902}
775 903
776/*----------------------------------------------------------------------*/ 904/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 905/* set_fonts () - load and set the various fonts
778/* 906 *
779 * init = 1 - initialize 907 * init = 1 - initialize
780 * 908 *
781 * fontname == FONT_UP - switch to bigger font 909 * fontname == FONT_UP - switch to bigger font
782 * fontname == FONT_DN - switch to smaller font 910 * fontname == FONT_DN - switch to smaller font
783 */ 911 */
… …
795 return false; 923 return false;
796 } 924 }
797 925
798#if ENABLE_STYLES 926#if ENABLE_STYLES
799 for (int i = RS_styleCount; --i; ) 927 for (int i = RS_styleCount; --i; )
800 if (TermWin.fontset[i] != TermWin.fontset[0]) 928 if (fontset[i] != fontset[0])
801 delete TermWin.fontset[i]; 929 delete fontset[i];
802#endif 930#endif
803 931
804 delete TermWin.fontset[0]; 932 delete fontset[0];
805 TermWin.fontset[0] = fs; 933 fontset[0] = fs;
806 934
807 prop = (*fs)[1]->properties (); 935 prop = (*fs)[1]->properties ();
808 prop.height += TermWin.lineSpace; 936 prop.height += lineSpace;
809 fs->set_prop (prop); 937 fs->set_prop (prop);
810 938
811 TermWin.fwidth = prop.width; 939 fwidth = prop.width;
812 TermWin.fheight = prop.height; 940 fheight = prop.height;
813 TermWin.fweight = prop.weight; 941 fbase = prop.ascent;
814 TermWin.fslant = prop.slant;
815 TermWin.fbase = (*fs)[1]->ascent;
816 942
817 for (int style = 1; style < 4; style++) 943 for (int style = 1; style < 4; style++)
818 { 944 {
819#if ENABLE_STYLES 945#if ENABLE_STYLES
820 const char *res = rs[Rs_font + style]; 946 const char *res = rs[Rs_font + style];
821 947
822 if (res && !*res) 948 if (res && !*res)
823 TermWin.fontset[style] = TermWin.fontset[0]; 949 fontset[style] = fontset[0];
824 else 950 else
825 { 951 {
826 TermWin.fontset[style] = fs = new rxvt_fontset (this); 952 fontset[style] = fs = new rxvt_fontset (this);
827 rxvt_fontprop prop2 = prop; 953 rxvt_fontprop prop2 = prop;
828 954
829 if (res) 955 if (res)
830 prop2.weight = prop2.slant = rxvt_fontprop::unset; 956 prop2.weight = prop2.slant = rxvt_fontprop::unset;
831 else 957 else
832 { 958 {
833 res = TermWin.fontset[0]->fontdesc; 959 res = fontset[0]->fontdesc;
834 960
835 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 961 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
836 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 962 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
837 } 963 }
838 964
839 fs->populate (res); 965 fs->populate (res);
840 fs->set_prop (prop2); 966 fs->set_prop (prop2);
841 } 967 }
842#else 968#else
843 TermWin.fontset[style] = TermWin.fontset[0]; 969 fontset[style] = fontset[0];
844#endif 970#endif
845 } 971 }
846 972
847 if (TermWin.parent[0]) 973 if (parent[0])
848 { 974 {
849 resize_all_windows (0, 0, 0); 975 resize_all_windows (0, 0, 0);
850 scr_remap_chars (); 976 scr_remap_chars ();
851 scr_touch (true); 977 scr_touch (true);
852 } 978 }
… …
854 return true; 980 return true;
855} 981}
856 982
857void rxvt_term::set_string_property (Atom prop, const char *str, int len) 983void rxvt_term::set_string_property (Atom prop, const char *str, int len)
858{ 984{
859 // TODO: SMART_WINDOW_TITLE
860 XChangeProperty (display->display, TermWin.parent[0], 985 XChangeProperty (display->display, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 986 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 987 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 988}
864 989
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 990void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 991{
867 // TODO: SMART_WINDOW_TITLE
868 wchar_t *ws = rxvt_mbstowcs (str, len); 992 wchar_t *ws = rxvt_mbstowcs (str, len);
869 char *s = rxvt_wcstoutf8 (ws); 993 char *s = rxvt_wcstoutf8 (ws);
870 994
871 XChangeProperty (display->display, TermWin.parent[0], 995 XChangeProperty (display->display, parent[0],
872 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 996 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
873 (const unsigned char *)s, strlen (s)); 997 (const unsigned char *)s, strlen (s));
874 998
875 free (s); 999 free (s);
876 free (ws); 1000 free (ws);
… …
881/* xterm sequences - title, iconName, color (exptl) */ 1005/* xterm sequences - title, iconName, color (exptl) */
882void 1006void
883rxvt_term::set_title (const char *str) 1007rxvt_term::set_title (const char *str)
884{ 1008{
885 set_string_property (XA_WM_NAME, str); 1009 set_string_property (XA_WM_NAME, str);
886#if ENABLE_FRILLS 1010#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_NAME], str); 1011 set_utf8_property (xa[XA_NET_WM_NAME], str);
888#endif 1012#endif
889} 1013}
890 1014
891void 1015void
892rxvt_term::set_icon_name (const char *str) 1016rxvt_term::set_icon_name (const char *str)
893{ 1017{
894 set_string_property (XA_WM_ICON_NAME, str); 1018 set_string_property (XA_WM_ICON_NAME, str);
895#if ENABLE_FRILLS 1019#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1020 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
897#endif 1021#endif
898} 1022}
899 1023
900#ifdef XTERM_COLOR_CHANGE 1024#ifdef XTERM_COLOR_CHANGE
… …
909 1033
910 /* handle color aliases */ 1034 /* handle color aliases */
911 if (isdigit (*color)) 1035 if (isdigit (*color))
912 { 1036 {
913 i = atoi (color); 1037 i = atoi (color);
1038
914 if (i >= 8 && i <= 15) 1039 if (i >= 8 && i <= 15)
915 { /* bright colors */ 1040 { /* bright colors */
916 i -= 8; 1041 i -= 8;
917# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 1043 SET_PIXCOLOR (idx);
920 goto Done; 1044 goto done;
921# endif
922
923 } 1045 }
1046
924 if (i >= 0 && i <= 7) 1047 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1048 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1049 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1050 SET_PIXCOLOR (idx);
928 goto Done; 1051 goto done;
929 } 1052 }
930 } 1053 }
931 1054
932 if (!rXParseAllocColor (& xcol, color)) 1055 if (!rXParseAllocColor (&xcol, color))
933 return; 1056 return;
934 1057
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1058 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1059
937 /* 1060 /*
… …
953 pix_colors_focused[idx] = xcol; 1076 pix_colors_focused[idx] = xcol;
954 SET_PIXCOLOR (idx); 1077 SET_PIXCOLOR (idx);
955 1078
956 /* XSetWindowAttributes attr; */ 1079 /* XSetWindowAttributes attr; */
957 /* Cursor cursor; */ 1080 /* Cursor cursor; */
958Done: 1081done:
1082
959#ifdef OFF_FOCUS_FADING 1083#if OFF_FOCUS_FADING
960 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
961 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1085 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
962#endif 1086#endif
963 1087
964 /*TODO: handle Color_BD, scrollbar background, etc. */ 1088 /*TODO: handle Color_BD, scrollbar background, etc. */
965 1089
966 recolour_cursor (); 1090 recolour_cursor ();
… …
1037 1161
1038/* -------------------------------------------------------------------- * 1162/* -------------------------------------------------------------------- *
1039 * - WINDOW RESIZING - * 1163 * - WINDOW RESIZING - *
1040 * -------------------------------------------------------------------- */ 1164 * -------------------------------------------------------------------- */
1041void 1165void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1166rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1043{ 1167{
1044 int fix_screen; 1168 int fix_screen;
1045
1046#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1169 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1170 dDisp;
1049 1171
1050 window_calc (width, height); 1172 window_calc (newwidth, newheight);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1173 XSetWMNormalHints (disp, parent[0], &szHint);
1052 1174
1053 if (!ignoreparent) 1175 if (!ignoreparent)
1054 { 1176 {
1055#ifdef SMART_RESIZE 1177#ifdef SMART_RESIZE
1056 /* 1178 /*
… …
1060 int x, y, x1, y1; 1182 int x, y, x1, y1;
1061 int dx, dy; 1183 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1184 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1185 Window unused_cr;
1064 1186
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1187 XTranslateCoordinates (disp, parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1188 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1189 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1190 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1191 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1192 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1193 * our position for handles and decorations. Counter it
1072 */ 1194 */
… …
1074 { 1196 {
1075 x -= x1; 1197 x -= x1;
1076 y -= y1; 1198 y -= y1;
1077 } 1199 }
1078 1200
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1201 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1202 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1203 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1204 dy = old_height - szHint.height;
1083 1205
1084 /* Check position of the center of the window */ 1206 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1207 if (x < x1) /* left half */
… …
1089 if (y < y1) /* top half */ 1211 if (y < y1) /* top half */
1090 dy = 0; 1212 dy = 0;
1091 else if (y == y1) /* exact center */ 1213 else if (y == y1) /* exact center */
1092 dy /= 2; 1214 dy /= 2;
1093 1215
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1216 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1217 szHint.width, szHint.height);
1096#else 1218#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1219 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1098#endif 1220#endif
1099 } 1221 }
1100 1222
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1102 1224
1103 if (fix_screen || width != old_width || height != old_height) 1225 if (fix_screen || newwidth != old_width || newheight != old_height)
1104 { 1226 {
1105 if (scrollbar_visible ()) 1227 if (scrollbar_visible ())
1106 { 1228 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1229 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1230 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1231 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1232 resize_scrollbar ();
1111 } 1233 }
1112 1234
1113 if (menubar_visible ()) 1235 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win, 1236 XMoveResizeWindow (disp, menuBar.win,
1115 window_vt_x, 0, 1237 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1238 width, menuBar_TotalHeight ());
1117 1239
1118 XMoveResizeWindow (display->display, TermWin.vt, 1240 XMoveResizeWindow (disp, vt,
1119 window_vt_x, window_vt_y, 1241 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1242 width, height);
1121 1243
1122 scr_clear (); 1244 scr_clear ();
1123#ifdef XPM_BACKGROUND 1245#ifdef XPM_BACKGROUND
1124 resize_pixmap (); 1246 resize_pixmap ();
1125#endif 1247#endif
… …
1131 int old_ncol = prev_ncol; 1253 int old_ncol = prev_ncol;
1132 1254
1133 /* scr_reset only works on the primary screen */ 1255 /* scr_reset only works on the primary screen */
1134 if (old_height) /* this is not the first time through */ 1256 if (old_height) /* this is not the first time through */
1135 { 1257 {
1136 unsigned int ncol = TermWin.ncol; 1258 unsigned int ocol = ncol;
1137 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1259 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1138 curr_screen = scr_change_screen (PRIMARY); 1260 curr_screen = scr_change_screen (PRIMARY);
1139 TermWin.ncol = ncol; 1261 ncol = ocol;
1140 } 1262 }
1141 1263
1142 scr_reset (); 1264 scr_reset ();
1143 1265
1144 if (curr_screen >= 0) /* this is not the first time through */ 1266 if (curr_screen >= 0) /* this is not the first time through */
1145 { 1267 {
1146 scr_change_screen (curr_screen); 1268 scr_change_screen (curr_screen);
1147 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1269 selection_check (old_ncol != ncol ? 4 : 0);
1148 } 1270 }
1149 } 1271 }
1150 1272
1151 old_width = szHint.width; 1273 old_width = szHint.width;
1152 old_height = szHint.height; 1274 old_height = szHint.height;
1153 1275
1154#ifdef XPM_BACKGROUND 1276#ifdef XPM_BACKGROUND
1155 if (TermWin.pixmap) 1277 if (pixmap)
1156 scr_touch (false); 1278 scr_touch (false);
1157#endif 1279#endif
1158 1280
1159#ifdef USE_XIM 1281#ifdef USE_XIM
1160 IMSetStatusPosition (); 1282 IMSetStatusPosition ();
… …
1164/* 1286/*
1165 * Set the width/height of the vt window in characters. Units are pixels. 1287 * Set the width/height of the vt window in characters. Units are pixels.
1166 * good for toggling 80/132 columns 1288 * good for toggling 80/132 columns
1167 */ 1289 */
1168void 1290void
1169rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1291rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1170{ 1292{
1171 XWindowAttributes wattr; 1293 XWindowAttributes wattr;
1172 1294
1173 if (width == 0 || height == 0) 1295 if (newwidth == 0 || newheight == 0)
1174 { 1296 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1297 XGetWindowAttributes (display->display, display->root, &wattr);
1298
1176 if (width == 0) 1299 if (newwidth == 0)
1177 width = wattr.width - szHint.base_width; 1300 newwidth = wattr.width - szHint.base_width;
1178 if (height == 0) 1301 if (newheight == 0)
1179 height = wattr.height - szHint.base_height; 1302 newheight = wattr.height - szHint.base_height;
1180 }
1181
1182 if (width != TermWin.width || height != TermWin.height)
1183 { 1303 }
1304
1305 if (newwidth != width || newheight != height)
1306 {
1184 width += szHint.base_width; 1307 newwidth += szHint.base_width;
1185 height += szHint.base_height; 1308 newheight += szHint.base_height;
1186 resize_all_windows (width, height, 0); 1309 resize_all_windows (newwidth, newheight, 0);
1187 } 1310 }
1188} 1311}
1189 1312
1190/* -------------------------------------------------------------------- * 1313/* -------------------------------------------------------------------- *
1191 * - X INPUT METHOD ROUTINES - * 1314 * - X INPUT METHOD ROUTINES - *
… …
1201 1324
1202void 1325void
1203rxvt_term::im_set_size (XRectangle &size) 1326rxvt_term::im_set_size (XRectangle &size)
1204{ 1327{
1205 // the int_bwidth terms make no sense to me 1328 // the int_bwidth terms make no sense to me
1206 size.x = TermWin.int_bwidth; 1329 size.x = int_bwidth;
1207 size.y = TermWin.int_bwidth; 1330 size.y = int_bwidth;
1208 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1331 size.width = Width2Pixel (ncol) + int_bwidth;
1209 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1332 size.height = Height2Pixel (nrow) + int_bwidth;
1210} 1333}
1211 1334
1212void 1335void
1213rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1336rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1214 XRectangle &status_rect, 1337 XRectangle &status_rect,
1215 const XRectangle &needed_rect) 1338 const XRectangle &needed_rect)
1216{ 1339{
1217 preedit_rect.x = needed_rect.width; 1340 preedit_rect.x = needed_rect.width;
1218 preedit_rect.y = 0; 1341 preedit_rect.y = 0;
1219 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1342 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1220 preedit_rect.height = TermWin.fheight; 1343 preedit_rect.height = fheight;
1221 1344
1222 status_rect.x = 0; 1345 status_rect.x = 0;
1223 status_rect.y = 0; 1346 status_rect.y = 0;
1224 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1347 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1225 status_rect.height = TermWin.fheight; 1348 status_rect.height = fheight;
1226} 1349}
1227 1350
1228/* Checking whether input method is running. */ 1351/* Checking whether input method is running. */
1229bool 1352bool
1230rxvt_term::IMisRunning () 1353rxvt_term::IMisRunning ()
… …
1258{ 1381{
1259 XPoint nspot; 1382 XPoint nspot;
1260 XVaNestedList preedit_attr; 1383 XVaNestedList preedit_attr;
1261 1384
1262 if (!Input_Context 1385 if (!Input_Context
1263 || !TermWin.focus 1386 || !focus
1264 || !(input_style & XIMPreeditPosition)) 1387 || !(input_style & XIMPreeditPosition))
1265 return; 1388 return;
1266 1389
1267 im_set_position (nspot); 1390 im_set_position (nspot);
1268 1391
… …
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1511 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1512 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1513 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1391 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1514 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1392 "*", 1515 "*",
1393 TermWin.fheight, 1516 fheight,
1394 TermWin.fheight + 1, TermWin.fheight - 1, 1517 fheight + 1, fheight - 1,
1395 TermWin.fheight - 2, TermWin.fheight + 2); 1518 fheight - 2, fheight + 2);
1396 1519
1397 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1520 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1398 &missing_charset_list, &missing_charset_count, &def_string); 1521 &missing_charset_list, &missing_charset_count, &def_string);
1399 1522
1400 if (missing_charset_list) 1523 if (missing_charset_list)
… …
1446 NULL); 1569 NULL);
1447 } 1570 }
1448 1571
1449 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1450 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1451 XNClientWindow, TermWin.vt, 1574 XNClientWindow, vt,
1452 XNFocusWindow, TermWin.parent[0], 1575 XNFocusWindow, parent[0],
1453 preedit_attr ? XNPreeditAttributes : NULL, 1576 preedit_attr ? XNPreeditAttributes : NULL,
1454 preedit_attr, 1577 preedit_attr,
1455 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1456 status_attr, NULL); 1579 status_attr, NULL);
1457 1580
… …
1474} 1597}
1475 1598
1476void 1599void
1477rxvt_term::im_cb () 1600rxvt_term::im_cb ()
1478{ 1601{
1479 int i, found, had_im; 1602 int i;
1480 const char *p; 1603 const char *p;
1481 char **s; 1604 char **s;
1482 char buf[IMBUFSIZ]; 1605 char buf[IMBUFSIZ];
1606
1607 SET_R (this);
1483 1608
1484 im_destroy (); 1609 im_destroy ();
1485 1610
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1612 if (Input_Context)
… …
1539{ 1664{
1540 XRectangle preedit_rect, status_rect, *needed_rect; 1665 XRectangle preedit_rect, status_rect, *needed_rect;
1541 XVaNestedList preedit_attr, status_attr; 1666 XVaNestedList preedit_attr, status_attr;
1542 1667
1543 if (!Input_Context 1668 if (!Input_Context
1544 || !TermWin.focus 1669 || !focus
1545 || !(input_style & XIMPreeditArea) 1670 || !(input_style & XIMPreeditArea)
1546 || !IMisRunning ()) 1671 || !IMisRunning ())
1547 return; 1672 return;
1548 1673
1549 /* Getting the necessary width of preedit area */ 1674 /* Getting the necessary width of preedit area */

Diff Legend

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