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.123 by root, Mon Dec 20 16:44:31 2004 UTC vs.
Revision 1.161 by root, Wed Jan 4 20:43:38 2006 UTC

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

Diff Legend

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