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.108 by root, Wed Aug 25 05:03:33 2004 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"
36 37
38#include <limits>
39
37#include <signal.h> 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
… …
166 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
167{ 182{
168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
169 184
170 termlist.push_back (this); 185 termlist.push_back (this);
171}
172 186
173rxvt_term::~rxvt_term () 187#ifdef KEYSYM_RESOURCE
174{ 188 keyboard = new keyboard_manager;
175 termlist.erase (find (termlist.begin (), termlist.end(), this));
176 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{
177 if (cmd_pid) 199 if (cmd_pid)
178 kill (-cmd_pid, SIGHUP); 200 kill (-cmd_pid, SIGHUP);
179 201
180 pty.put ();
181
182#ifdef UTMP_SUPPORT 202#ifdef UTMP_SUPPORT
183 privileged_utmp (RESTORE); 203 privileged_utmp (RESTORE);
184#endif 204#endif
185 205
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 ();
216
186#if ENABLE_STYLES 217#if ENABLE_STYLES
187 for (int i = RS_styleCount; --i; ) 218 for (int i = RS_styleCount; --i; )
188 if (TermWin.fontset[i] != TermWin.fontset[0]) 219 if (fontset[i] != fontset[0])
189 delete TermWin.fontset[i]; 220 delete fontset[i];
190#endif 221#endif
191 delete TermWin.fontset[0]; 222 delete fontset[0];
192 223
193 if (display) 224 if (display)
194 { 225 {
226 dDisp;
227
195 selection_clear (); 228 selection_clear ();
196 229
197#ifdef USE_XIM 230#ifdef USE_XIM
198 im_destroy (); 231 im_destroy ();
199#endif 232#endif
200#ifdef MENUBAR 233#ifdef MENUBAR
201 if (menubarGC) XFreeGC (display->display, menubarGC); 234 if (menubarGC) XFreeGC (disp, menubarGC);
202#endif 235#endif
203#ifdef XTERM_SCROLLBAR 236#ifdef XTERM_SCROLLBAR
204 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
205 if (ShadowGC) XFreeGC (display->display, ShadowGC); 238 if (ShadowGC) XFreeGC (disp, ShadowGC);
206#endif 239#endif
207#ifdef PLAIN_SCROLLBAR 240#ifdef PLAIN_SCROLLBAR
208 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
209#endif 242#endif
210#ifdef NEXT_SCROLLBAR 243#ifdef NEXT_SCROLLBAR
211 if (blackGC) XFreeGC (display->display, blackGC); 244 if (blackGC) XFreeGC (disp, blackGC);
212 if (whiteGC) XFreeGC (display->display, whiteGC); 245 if (whiteGC) XFreeGC (disp, whiteGC);
213 if (grayGC) XFreeGC (display->display, grayGC); 246 if (grayGC) XFreeGC (disp, grayGC);
214 if (darkGC) XFreeGC (display->display, darkGC); 247 if (darkGC) XFreeGC (disp, darkGC);
215 if (stippleGC) XFreeGC (display->display, stippleGC); 248 if (stippleGC) XFreeGC (disp, stippleGC);
216 if (dimple) XFreePixmap (display->display, dimple); 249 if (dimple) XFreePixmap (disp, dimple);
217 if (upArrow) XFreePixmap (display->display, upArrow); 250 if (upArrow) XFreePixmap (disp, upArrow);
218 if (downArrow) XFreePixmap (display->display, downArrow); 251 if (downArrow) XFreePixmap (disp, downArrow);
219 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 252 if (upArrowHi) XFreePixmap (disp, upArrowHi);
220 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 253 if (downArrowHi) XFreePixmap (disp, downArrowHi);
221#endif 254#endif
222#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
223 if (topShadowGC) XFreeGC (display->display, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
224 if (botShadowGC) XFreeGC (display->display, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
225 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
226#endif 259#endif
227 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
228 261
229#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
230 delete menuBar.drawable; 263 delete menuBar.drawable;
231 //if (menuBar.win) 264 //if (menuBar.win)
232 // XDestroyWindow (display->display, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
233#endif 266#endif
234 delete TermWin.drawable; 267 delete drawable;
235 // destroy all windows 268 // destroy all windows
236 if (TermWin.parent[0]) 269 if (parent[0])
237 XDestroyWindow (display->display, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
238 } 271 }
239 272
240 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
241 274
242 delete pix_colors_focused; 275 delete pix_colors_focused;
243#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
244 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
278#endif
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
245#endif 281#endif
246 282
247 displays.put (display); 283 displays.put (display);
248 284
249 scr_release (); 285 scr_release ();
250 286
251 /* clear all resources */ 287 /* clear all resources */
252 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
253 free (allocated[i]); 289 free (allocated [i]);
254 290
255 free (selection.text); 291 free (selection.text);
256 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
257 free (env_windowid); 293 free (env_windowid);
258 free (env_display); 294 free (env_display);
259 free (env_term); 295 free (env_term);
260 free (env_colorfgbg); 296 free (env_colorfgbg);
261 free (locale); 297 free (locale);
262#if 0 298 free (v_buffer);
263 free (codeset); 299 free (incr_buf);
264#endif
265 300
266 delete envv; 301 delete envv;
267 delete argv; 302 delete argv;
303
304#ifdef KEYSYM_RESOURCE
305 delete keyboard;
306#endif
307}
308
309void
310rxvt_term::child_exit ()
311{
312 cmd_pid = 0;
313
314 if (!OPTION (Opt_hold))
315 destroy ();
268} 316}
269 317
270void 318void
271rxvt_term::destroy () 319rxvt_term::destroy ()
272{ 320{
… …
324 372
325 delete this; 373 delete this;
326} 374}
327 375
328/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
329/* 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/*----------------------------------------------------------------------*/
330bool 468bool
331rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv)
332{ 470{
333 SET_R (this); 471 SET_R (this);
334 472
473 set_locale ("");
474
335 if (!init_vars ()) 475 if (!init_vars ())
336 return false; 476 return false;
337 477
338 init_secondary (); 478 init_secondary ();
339 479
340 const char **cmd_argv = init_resources (argc, argv); 480 const char **cmd_argv = init_resources (argc, argv);
341 481
342 set_locale (""); 482#ifdef KEYSYM_RESOURCE
483 keyboard->register_done ();
484#endif
343 485
344#if MENUBAR_MAX 486#if MENUBAR_MAX
345 menubar_read (rs[Rs_menu]); 487 menubar_read (rs[Rs_menu]);
346#endif 488#endif
347#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
348 if (options & Opt_scrollBar) 490 if (OPTION (Opt_scrollBar))
349 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
350#endif 492#endif
351 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
352 create_windows (argc, argv); 507 create_windows (argc, argv);
353 508
509 dDisp;
510
354 init_xlocale (); 511 init_xlocale ();
355 512
356 scr_reset (); /* initialize screen */ 513 scr_reset (); /* initialize screen */
357 514
358#if 0 515#if 0
359 XSynchronize (display->display, True); 516 XSynchronize (disp, True);
360#endif 517#endif
361 518
362#ifdef HAVE_SCROLLBARS 519#ifdef HAVE_SCROLLBARS
363 if (options & Opt_scrollBar) 520 if (OPTION (Opt_scrollBar))
364 resize_scrollbar (); /* create and map scrollbar */ 521 resize_scrollbar (); /* create and map scrollbar */
365#endif 522#endif
366#if (MENUBAR_MAX) 523#if (MENUBAR_MAX)
367 if (menubar_visible ()) 524 if (menubar_visible ())
368 XMapWindow (display->display, menuBar.win); 525 XMapWindow (disp, menuBar.win);
369#endif 526#endif
370#ifdef TRANSPARENT 527#ifdef TRANSPARENT
371 if (options & Opt_transparent) 528 if (OPTION (Opt_transparent))
372 { 529 {
373 XSelectInput (display->display, display->root, PropertyChangeMask); 530 XSelectInput (disp, display->root, PropertyChangeMask);
374 check_our_parents (); 531 check_our_parents ();
375 rootwin_ev.start (display, display->root); 532 rootwin_ev.start (display, display->root);
376 } 533 }
377#endif 534#endif
378 535
379 XMapWindow (display->display, TermWin.vt); 536 XMapWindow (disp, vt);
380 XMapWindow (display->display, TermWin.parent[0]); 537 XMapWindow (disp, parent[0]);
381 538
382 set_colorfgbg (); 539 set_colorfgbg ();
383 540
384 init_command (cmd_argv); 541 init_command (cmd_argv);
385 542
543 free (cmd_argv);
544
545 if (pty.pty >= 0)
386 pty_ev.start (pty.pty, EVENT_READ); 546 pty_ev.start (pty.pty, EVENT_READ);
387 547
388 check_ev.start (); 548 check_ev.start ();
389 549
550 HOOK_INVOKE ((this, HOOK_START, DT_END));
551
390 return true; 552 return true;
391} 553}
392 554
393static 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;
394 594
395void 595void
396rxvt_init () 596rxvt_init ()
397{ 597{
398 /* install exit handler for cleanup */
399#if 0
400#ifdef HAVE_ATEXIT
401 atexit (rxvt_clean_exit);
402#else
403#endif
404#endif
405 /* 598 /*
406 * Save and then give up any super-user privileges 599 * Save and then give up any super-user privileges
407 * If we need privileges in any area then we must specifically request it. 600 * If we need privileges in any area then we must specifically request it.
408 * We should only need to be root in these cases: 601 * We should only need to be root in these cases:
409 * 1. write utmp entries on some systems 602 * 1. write utmp entries on some systems
410 * 2. chown tty on some systems 603 * 2. chown tty on some systems
411 */ 604 */
412 rxvt_privileges (SAVE); 605 rxvt_privileges (SAVE);
413 rxvt_privileges (IGNORE); 606 rxvt_privileges (IGNORE);
414 607
415 struct sigaction sa; 608 signal (SIGHUP, SIG_IGN);
609 signal (SIGPIPE, SIG_IGN);
416 610
417 sigfillset (&sa.sa_mask); 611 sig_handlers.sw_chld.start (SIGCHLD);
418 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 612 sig_handlers.sw_term.start (SIGTERM);
419 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 613 sig_handlers.sw_int.start (SIGINT);
420 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
421 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
422 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
423 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
424 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
425 614
426 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 615 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
427 /* signal (SIGURG, SIG_DFL); */ 616 /* signal (SIGURG, SIG_DFL); */
428 617
429 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss
430 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
431}
432 621
433/* ------------------------------------------------------------------------- * 622#ifdef USE_XGETDEFAULT
434 * SIGNAL HANDLING & EXIT HANDLER * 623 XrmInitialize ();
435 * ------------------------------------------------------------------------- */
436/*
437 * Catch a SIGCHLD signal and exit if the direct child has died
438 */
439
440void rxvt_term::child_exited (int pid)
441{
442 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
443 if (pid == (*t)->cmd_pid)
444 {
445 (*t)->destroy ();
446 break;
447 }
448}
449
450/* ARGSUSED */
451/* INTPROTO */
452RETSIGTYPE
453rxvt_Child_signal (int sig __attribute__ ((unused)))
454{
455 int pid, save_errno = errno;
456
457 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
458 rxvt_term::child_exited (pid);
459
460 errno = save_errno;
461}
462
463/*
464 * Catch a fatal signal and tidy up before quitting
465 */
466/* INTPROTO */
467RETSIGTYPE
468rxvt_Exit_signal (int sig)
469{
470 signal (sig, SIG_DFL);
471#ifdef DEBUG_CMD
472 rxvt_warn ("caught signal %d, exiting.\n", sig);
473#endif 624#endif
474 rxvt_clean_exit ();
475 kill (getpid (), sig);
476}
477
478/* INTPROTO */
479int
480rxvt_xerror_handler (Display *display, XErrorEvent *event)
481{
482 if (GET_R->allowedxerror == -1)
483 GET_R->allowedxerror = event->error_code;
484 else
485 {
486 old_xerror_handler (display, event);
487 GET_R->destroy ();
488 }
489
490 return 0;
491}
492
493/*----------------------------------------------------------------------*/
494/*
495 * Exit gracefully, clearing the utmp entry and restoring tty attributes
496 * TODO: if debugging, this should free up any known resources if we can
497 */
498/* INTPROTO */
499void
500rxvt_clean_exit ()
501{
502 // TODO: rxvtd should clean up all ressources
503 if (GET_R)
504 GET_R->destroy ();
505} 625}
506 626
507/* ------------------------------------------------------------------------- * 627/* ------------------------------------------------------------------------- *
508 * MEMORY ALLOCATION WRAPPERS * 628 * MEMORY ALLOCATION WRAPPERS *
509 * ------------------------------------------------------------------------- */ 629 * ------------------------------------------------------------------------- */
510/* INTPROTO */ 630void *
511void *
512rxvt_malloc (size_t size) 631rxvt_malloc (size_t size)
513{ 632{
514 void *p;
515
516 p = malloc (size); 633 void *p = malloc (size);
634
517 if (p) 635 if (!p)
518 return p;
519
520 rxvt_fatal ("memory allocation failure. aborting.\n"); 636 rxvt_fatal ("memory allocation failure. aborting.\n");
521 /* NOTREACHED */
522}
523 637
524/* INTPROTO */ 638 return p;
525void * 639}
640
641void *
526rxvt_calloc (size_t number, size_t size) 642rxvt_calloc (size_t number, size_t size)
527{ 643{
528 void *p;
529
530 p = calloc (number, size); 644 void *p = calloc (number, size);
645
531 if (p) 646 if (!p)
532 return p;
533
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 647 rxvt_fatal ("memory allocation failure. aborting.\n");
535 /* NOTREACHED */
536}
537 648
538/* INTPROTO */ 649 return p;
650}
651
539void * 652void *
540rxvt_realloc (void *ptr, size_t size) 653rxvt_realloc (void *ptr, size_t size)
541{ 654{
542 void *p;
543
544 if (ptr)
545 p = realloc (ptr, size); 655 void *p = realloc (ptr, size);
546 else
547 p = malloc (size);
548 656
549 if (p) 657 if (!p)
550 return p;
551
552 rxvt_fatal ("memory allocation failure. aborting.\n"); 658 rxvt_fatal ("memory allocation failure. aborting.\n");
553 /* NOTREACHED */ 659
660 return p;
554} 661}
555 662
556/* ------------------------------------------------------------------------- * 663/* ------------------------------------------------------------------------- *
557 * PRIVILEGED OPERATIONS * 664 * PRIVILEGED OPERATIONS *
558 * ------------------------------------------------------------------------- */ 665 * ------------------------------------------------------------------------- */
… …
610 717
611#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
612void 719void
613rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
614{ 721{
615 if ((options & Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit)
616 || !pty.name || !*pty.name) 723 || !pty.name || !*pty.name)
617 return; 724 return;
618 725
619 rxvt_privileges (RESTORE); 726 rxvt_privileges (RESTORE);
620 727
… …
631/* 738/*
632 * window size/position calculcations for XSizeHint and other storage. 739 * window size/position calculcations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 740 * if width/height are non-zero then override calculated width/height
634 */ 741 */
635void 742void
636rxvt_term::window_calc (unsigned int width, unsigned int height) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 744{
638 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
639 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, mb_h, flags;
640 unsigned int w, h; 747 unsigned int w, h;
641 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
749 dDisp;
642 750
643 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",
644 TermWin.ncol, TermWin.nrow, szHint.width, 752 ncol, nrow, szHint.width, szHint.height));
645 szHint.height)); 753
646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
647 szHint.win_gravity = NorthWestGravity; 755 szHint.win_gravity = NorthWestGravity;
648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
649 757
650 recalc_x = recalc_y = 0; 758 recalc_x = recalc_y = 0;
651 flags = 0; 759 flags = 0;
760
652 if (!parsed_geometry) 761 if (!parsed_geometry)
653 { 762 {
654 parsed_geometry = 1; 763 parsed_geometry = 1;
764
655 if (rs[Rs_geometry]) 765 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 766 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
767
657 if (flags & WidthValue) 768 if (flags & WidthValue)
658 { 769 {
659 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 770 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
660 szHint.flags |= USSize; 771 szHint.flags |= USSize;
661 } 772 }
773
662 if (flags & HeightValue) 774 if (flags & HeightValue)
663 { 775 {
664 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 776 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
665 szHint.flags |= USSize; 777 szHint.flags |= USSize;
666 } 778 }
779
667 if (flags & XValue) 780 if (flags & XValue)
668 { 781 {
669 szHint.x = x; 782 szHint.x = x;
670 szHint.flags |= USPosition; 783 szHint.flags |= USPosition;
784
671 if (flags & XNegative) 785 if (flags & XNegative)
672 { 786 {
673 recalc_x = 1; 787 recalc_x = 1;
674 szHint.win_gravity = NorthEastGravity; 788 szHint.win_gravity = NorthEastGravity;
675 } 789 }
676 } 790 }
791
677 if (flags & YValue) 792 if (flags & YValue)
678 { 793 {
679 szHint.y = y; 794 szHint.y = y;
680 szHint.flags |= USPosition; 795 szHint.flags |= USPosition;
796
681 if (flags & YNegative) 797 if (flags & YNegative)
682 { 798 {
683 recalc_y = 1; 799 recalc_y = 1;
800
684 if (szHint.win_gravity == NorthEastGravity) 801 if (szHint.win_gravity == NorthEastGravity)
685 szHint.win_gravity = SouthEastGravity; 802 szHint.win_gravity = SouthEastGravity;
686 else 803 else
687 szHint.win_gravity = SouthWestGravity; 804 szHint.win_gravity = SouthWestGravity;
688 } 805 }
689 } 806 }
690 } 807 }
691 808
692 /* TODO: BOUNDS */ 809 /* TODO: BOUNDS */
693 TermWin.width = TermWin.ncol * TermWin.fwidth; 810 width = ncol * fwidth;
694 TermWin.height = TermWin.nrow * TermWin.fheight; 811 height = nrow * fheight;
695 max_width = MAX_COLS * TermWin.fwidth; 812 max_width = MAX_COLS * fwidth;
696 max_height = MAX_ROWS * TermWin.fheight; 813 max_height = MAX_ROWS * fheight;
697 814
698 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
699 816
700 sb_w = mb_h = 0; 817 sb_w = mb_h = 0;
701 window_vt_x = window_vt_y = TermWin.int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
702 819
703 if (scrollbar_visible ()) 820 if (scrollbar_visible ())
704 { 821 {
705 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
706 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
707 if (!(options & Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
708 window_vt_x += sb_w; 825 window_vt_x += sb_w;
709 } 826 }
710 827
711 if (menubar_visible ()) 828 if (menubar_visible ())
712 { 829 {
713 mb_h = menuBar_TotalHeight (); 830 mb_h = menuBar_TotalHeight ();
714 szHint.base_height += mb_h; 831 szHint.base_height += mb_h;
715 window_vt_y += mb_h; 832 window_vt_y += mb_h;
716 } 833 }
717 834
718 szHint.width_inc = TermWin.fwidth; 835 szHint.width_inc = fwidth;
719 szHint.height_inc = TermWin.fheight; 836 szHint.height_inc = fheight;
720 szHint.min_width = szHint.base_width + szHint.width_inc; 837 szHint.min_width = szHint.base_width + szHint.width_inc;
721 szHint.min_height = szHint.base_height + szHint.height_inc; 838 szHint.min_height = szHint.base_height + szHint.height_inc;
722 839
723 if (width && width - szHint.base_width < max_width) 840 if (newwidth && newwidth - szHint.base_width < max_width)
724 { 841 {
725 szHint.width = width; 842 szHint.width = newwidth;
726 TermWin.width = width - szHint.base_width; 843 width = newwidth - szHint.base_width;
727 } 844 }
728 else 845 else
729 { 846 {
730 MIN_IT (TermWin.width, max_width); 847 min_it (width, max_width);
731 szHint.width = szHint.base_width + TermWin.width; 848 szHint.width = szHint.base_width + width;
732 } 849 }
733 850
734 if (height && height - szHint.base_height < max_height) 851 if (newheight && newheight - szHint.base_height < max_height)
735 { 852 {
736 szHint.height = height; 853 szHint.height = newheight;
737 TermWin.height = height - szHint.base_height; 854 height = newheight - szHint.base_height;
738 } 855 }
739 else 856 else
740 { 857 {
741 MIN_IT (TermWin.height, max_height); 858 min_it (height, max_height);
742 szHint.height = szHint.base_height + TermWin.height; 859 szHint.height = szHint.base_height + height;
743 } 860 }
744 861
745 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 863 window_sb_x = szHint.width - sb_w;
747 864
748 if (recalc_x) 865 if (recalc_x)
749 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
750 - szHint.width - 2 * TermWin.ext_bwidth);
751 if (recalc_y) 867 if (recalc_y)
752 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 868 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
753 - szHint.height - 2 * TermWin.ext_bwidth);
754 869
755 TermWin.ncol = TermWin.width / TermWin.fwidth; 870 ncol = width / fwidth;
756 TermWin.nrow = TermWin.height / TermWin.fheight; 871 nrow = height / fheight;
757 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",
758 TermWin.ncol, TermWin.nrow, szHint.width, 873 ncol, nrow, szHint.width,
759 szHint.height)); 874 szHint.height));
760 return; 875 return;
761} 876}
762 877
763/*----------------------------------------------------------------------*/ 878/*----------------------------------------------------------------------*/
… …
771 if (pty.pty < 0) 886 if (pty.pty < 0)
772 return; 887 return;
773 888
774 struct winsize ws; 889 struct winsize ws;
775 890
776 ws.ws_col = TermWin.ncol; 891 ws.ws_col = ncol;
777 ws.ws_row = TermWin.nrow; 892 ws.ws_row = nrow;
778 ws.ws_xpixel = TermWin.width; 893 ws.ws_xpixel = width;
779 ws.ws_ypixel = TermWin.height; 894 ws.ws_ypixel = height;
780 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
781 896
782#if 0 897#if 0
783 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
784 if (cmd_pid) /* force through to the command */ 899 if (cmd_pid) /* force through to the command */
785 kill (cmd_pid, SIGWINCH); 900 kill (-cmd_pid, SIGWINCH);
786#endif 901#endif
787} 902}
788 903
789/*----------------------------------------------------------------------*/ 904/*----------------------------------------------------------------------*/
790/* set_fonts () - load and set the various fonts 905/* set_fonts () - load and set the various fonts
791/* 906 *
792 * init = 1 - initialize 907 * init = 1 - initialize
793 * 908 *
794 * fontname == FONT_UP - switch to bigger font 909 * fontname == FONT_UP - switch to bigger font
795 * fontname == FONT_DN - switch to smaller font 910 * fontname == FONT_DN - switch to smaller font
796 */ 911 */
… …
798rxvt_term::set_fonts () 913rxvt_term::set_fonts ()
799{ 914{
800 rxvt_fontset *fs = new rxvt_fontset (this); 915 rxvt_fontset *fs = new rxvt_fontset (this);
801 rxvt_fontprop prop; 916 rxvt_fontprop prop;
802 917
803 prop.width = prop.height = prop.weight = prop.slant
804 = rxvt_fontprop::unset;
805
806 if (!fs 918 if (!fs
807 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop) 919 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
808 || !fs->realize_font (1)) 920 || !fs->realize_font (1))
809 { 921 {
810 delete fs; 922 delete fs;
811 return false; 923 return false;
812 } 924 }
813 925
814#if ENABLE_STYLES 926#if ENABLE_STYLES
815 for (int i = RS_styleCount; --i; ) 927 for (int i = RS_styleCount; --i; )
816 if (TermWin.fontset[i] != TermWin.fontset[0]) 928 if (fontset[i] != fontset[0])
817 delete TermWin.fontset[i]; 929 delete fontset[i];
818#endif 930#endif
819 931
820 delete TermWin.fontset[0]; 932 delete fontset[0];
821 TermWin.fontset[0] = fs; 933 fontset[0] = fs;
822 934
823 fs->prop = prop = (*fs)[1]->properties (); 935 prop = (*fs)[1]->properties ();
936 prop.height += lineSpace;
937 fs->set_prop (prop);
824 938
825 TermWin.fwidth = prop.width; 939 fwidth = prop.width;
826 TermWin.fheight = prop.height; 940 fheight = prop.height;
827 TermWin.fweight = prop.weight; 941 fbase = prop.ascent;
828 TermWin.fslant = prop.slant;
829 TermWin.fbase = (*fs)[1]->ascent;
830 942
831 for (int style = 1; style < 4; style++) 943 for (int style = 1; style < 4; style++)
832 { 944 {
833#if ENABLE_STYLES 945#if ENABLE_STYLES
834 const char *res = rs[Rs_font + style]; 946 const char *res = rs[Rs_font + style];
835 947
836 if (res && !*res) 948 if (res && !*res)
837 TermWin.fontset[style] = TermWin.fontset[0]; 949 fontset[style] = fontset[0];
838 else 950 else
839 { 951 {
840 TermWin.fontset[style] = fs = new rxvt_fontset (this); 952 fontset[style] = fs = new rxvt_fontset (this);
841 rxvt_fontprop prop2 = prop; 953 rxvt_fontprop prop2 = prop;
842 954
843 if (res) 955 if (res)
844 prop2.weight = prop2.slant = rxvt_fontprop::unset; 956 prop2.weight = prop2.slant = rxvt_fontprop::unset;
845 else 957 else
846 { 958 {
847 res = TermWin.fontset[0]->fontdesc; 959 res = fontset[0]->fontdesc;
848 960
849 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;
850 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;
851 } 963 }
852 964
853 fs->populate (res, prop2); 965 fs->populate (res);
966 fs->set_prop (prop2);
854 } 967 }
855#else 968#else
856 TermWin.fontset[style] = TermWin.fontset[0]; 969 fontset[style] = fontset[0];
857#endif 970#endif
858 } 971 }
859 972
860 if (TermWin.parent[0]) 973 if (parent[0])
861 { 974 {
862 resize_all_windows (0, 0, 0); 975 resize_all_windows (0, 0, 0);
863 scr_remap_chars (); 976 scr_remap_chars ();
864 scr_touch (true); 977 scr_touch (true);
865 } 978 }
866 979
867 return true; 980 return true;
868} 981}
869 982
983void rxvt_term::set_string_property (Atom prop, const char *str, int len)
984{
985 XChangeProperty (display->display, parent[0],
986 prop, XA_STRING, 8, PropModeReplace,
987 (const unsigned char *)str, len >= 0 ? len : strlen (str));
988}
989
990void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
991{
992 wchar_t *ws = rxvt_mbstowcs (str, len);
993 char *s = rxvt_wcstoutf8 (ws);
994
995 XChangeProperty (display->display, parent[0],
996 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
997 (const unsigned char *)s, strlen (s));
998
999 free (s);
1000 free (ws);
1001}
1002
870/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
871/*----------------------------------------------------------------------*/ 1004/*----------------------------------------------------------------------*/
872/* xterm sequences - title, iconName, color (exptl) */ 1005/* xterm sequences - title, iconName, color (exptl) */
873void 1006void
874rxvt_term::set_title (const char *str) 1007rxvt_term::set_title (const char *str)
875{ 1008{
876#ifdef SMART_WINDOW_TITLE 1009 set_string_property (XA_WM_NAME, str);
877 char *name; 1010#if ENABLE_EWMH
878 1011 set_utf8_property (xa[XA_NET_WM_NAME], str);
879 if (!XFetchName (display->display, TermWin.parent[0], &name))
880 name = NULL;
881
882 if (name == NULL || strcmp (name, str))
883#endif
884 XStoreName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
887 if (name)
888 XFree (name);
889#endif 1012#endif
890} 1013}
891 1014
892void 1015void
893rxvt_term::set_icon_name (const char *str) 1016rxvt_term::set_icon_name (const char *str)
894{ 1017{
895#ifdef SMART_WINDOW_TITLE 1018 set_string_property (XA_WM_ICON_NAME, str);
896 char *name; 1019#if ENABLE_EWMH
897 1020 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
898 if (!XGetIconName (display->display, TermWin.parent[0], &name))
899 name = NULL;
900
901 if (name == NULL || strcmp (name, str))
902#endif
903 XSetIconName (display->display, TermWin.parent[0], str);
904
905#ifdef SMART_WINDOW_TITLE
906 if (name)
907 XFree (name);
908#endif 1021#endif
909} 1022}
910 1023
911#ifdef XTERM_COLOR_CHANGE 1024#ifdef XTERM_COLOR_CHANGE
912void 1025void
… …
920 1033
921 /* handle color aliases */ 1034 /* handle color aliases */
922 if (isdigit (*color)) 1035 if (isdigit (*color))
923 { 1036 {
924 i = atoi (color); 1037 i = atoi (color);
1038
925 if (i >= 8 && i <= 15) 1039 if (i >= 8 && i <= 15)
926 { /* bright colors */ 1040 { /* bright colors */
927 i -= 8; 1041 i -= 8;
928# ifndef NO_BRIGHTCOLOR
929 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
930 SET_PIXCOLOR (idx); 1043 SET_PIXCOLOR (idx);
931 goto Done; 1044 goto done;
932# endif
933
934 } 1045 }
1046
935 if (i >= 0 && i <= 7) 1047 if (i >= 0 && i <= 7)
936 { /* normal colors */ 1048 { /* normal colors */
937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1049 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938 SET_PIXCOLOR (idx); 1050 SET_PIXCOLOR (idx);
939 goto Done; 1051 goto done;
940 } 1052 }
941 } 1053 }
942 1054
943 if (!rXParseAllocColor (& xcol, color)) 1055 if (!rXParseAllocColor (&xcol, color))
944 return; 1056 return;
945 1057
946 /* XStoreColor (display->display, display->cmap, XColor*); */ 1058 /* XStoreColor (display->display, display->cmap, XColor*); */
947 1059
948 /* 1060 /*
… …
964 pix_colors_focused[idx] = xcol; 1076 pix_colors_focused[idx] = xcol;
965 SET_PIXCOLOR (idx); 1077 SET_PIXCOLOR (idx);
966 1078
967 /* XSetWindowAttributes attr; */ 1079 /* XSetWindowAttributes attr; */
968 /* Cursor cursor; */ 1080 /* Cursor cursor; */
969Done: 1081done:
1082
970#ifdef OFF_FOCUS_FADING 1083#if OFF_FOCUS_FADING
971 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
972 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]);
973#endif 1086#endif
974 1087
975 /*TODO: handle Color_BD, scrollbar background, etc. */ 1088 /*TODO: handle Color_BD, scrollbar background, etc. */
976 1089
977 recolour_cursor (); 1090 recolour_cursor ();
… …
1031 1144
1032 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1145 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1033} 1146}
1034 1147
1035/*----------------------------------------------------------------------*/ 1148/*----------------------------------------------------------------------*/
1036/*
1037 * Colour determination for low colour displays, routine from
1038 * Hans de Goede <hans@highrise.nl>
1039 */
1040 1149
1041int 1150int
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1151rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1043{ 1152{
1044 if (!screen_in_out->set (display, colour)) 1153 if (!screen_in_out->set (display, colour))
… …
1052 1161
1053/* -------------------------------------------------------------------- * 1162/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1163 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1164 * -------------------------------------------------------------------- */
1056void 1165void
1057rxvt_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)
1058{ 1167{
1059 int fix_screen; 1168 int fix_screen;
1060
1061#ifdef SMART_RESIZE
1062 int old_width = szHint.width, old_height = szHint.height; 1169 int old_width = szHint.width, old_height = szHint.height;
1063#endif 1170 dDisp;
1064 1171
1065 window_calc (width, height); 1172 window_calc (newwidth, newheight);
1066 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1173 XSetWMNormalHints (disp, parent[0], &szHint);
1067 1174
1068 if (!ignoreparent) 1175 if (!ignoreparent)
1069 { 1176 {
1070#ifdef SMART_RESIZE 1177#ifdef SMART_RESIZE
1071 /* 1178 /*
… …
1075 int x, y, x1, y1; 1182 int x, y, x1, y1;
1076 int dx, dy; 1183 int dx, dy;
1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1184 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1078 Window unused_cr; 1185 Window unused_cr;
1079 1186
1080 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1187 XTranslateCoordinates (disp, parent[0], display->root,
1081 0, 0, &x, &y, &unused_cr); 1188 0, 0, &x, &y, &unused_cr);
1082 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1189 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1190 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1084 /* 1191 /*
1085 * 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
1086 * our position for handles and decorations. Counter it 1193 * our position for handles and decorations. Counter it
1087 */ 1194 */
… …
1089 { 1196 {
1090 x -= x1; 1197 x -= x1;
1091 y -= y1; 1198 y -= y1;
1092 } 1199 }
1093 1200
1094 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1201 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1095 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1202 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1096 dx = old_width - szHint.width; 1203 dx = old_width - szHint.width;
1097 dy = old_height - szHint.height; 1204 dy = old_height - szHint.height;
1098 1205
1099 /* Check position of the center of the window */ 1206 /* Check position of the center of the window */
1100 if (x < x1) /* left half */ 1207 if (x < x1) /* left half */
… …
1104 if (y < y1) /* top half */ 1211 if (y < y1) /* top half */
1105 dy = 0; 1212 dy = 0;
1106 else if (y == y1) /* exact center */ 1213 else if (y == y1) /* exact center */
1107 dy /= 2; 1214 dy /= 2;
1108 1215
1109 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1216 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1110 szHint.width, szHint.height); 1217 szHint.width, szHint.height);
1111#else 1218#else
1112 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1219 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1113#endif 1220#endif
1114 } 1221 }
1115 1222
1116 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1117 1224
1118 if (fix_screen || width != old_width || height != old_height) 1225 if (fix_screen || newwidth != old_width || newheight != old_height)
1119 { 1226 {
1120 if (scrollbar_visible ()) 1227 if (scrollbar_visible ())
1121 { 1228 {
1122 XMoveResizeWindow (display->display, scrollBar.win, 1229 XMoveResizeWindow (disp, scrollBar.win,
1123 window_sb_x, 0, 1230 window_sb_x, 0,
1124 scrollbar_TotalWidth (), szHint.height); 1231 scrollbar_TotalWidth (), szHint.height);
1125 resize_scrollbar (); 1232 resize_scrollbar ();
1126 } 1233 }
1127 1234
1128 if (menubar_visible ()) 1235 if (menubar_visible ())
1129 XMoveResizeWindow (display->display, menuBar.win, 1236 XMoveResizeWindow (disp, menuBar.win,
1130 window_vt_x, 0, 1237 window_vt_x, 0,
1131 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1238 width, menuBar_TotalHeight ());
1132 1239
1133 XMoveResizeWindow (display->display, TermWin.vt, 1240 XMoveResizeWindow (disp, vt,
1134 window_vt_x, window_vt_y, 1241 window_vt_x, window_vt_y,
1135 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1242 width, height);
1243
1136 scr_clear (); 1244 scr_clear ();
1137#ifdef XPM_BACKGROUND 1245#ifdef XPM_BACKGROUND
1138 resize_pixmap (); 1246 resize_pixmap ();
1139#endif 1247#endif
1140 } 1248 }
… …
1145 int old_ncol = prev_ncol; 1253 int old_ncol = prev_ncol;
1146 1254
1147 /* scr_reset only works on the primary screen */ 1255 /* scr_reset only works on the primary screen */
1148 if (old_height) /* this is not the first time through */ 1256 if (old_height) /* this is not the first time through */
1149 { 1257 {
1150 unsigned int ncol = TermWin.ncol; 1258 unsigned int ocol = ncol;
1151 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
1152 curr_screen = scr_change_screen (PRIMARY); 1260 curr_screen = scr_change_screen (PRIMARY);
1153 TermWin.ncol = ncol; 1261 ncol = ocol;
1154 } 1262 }
1155 1263
1156 scr_reset (); 1264 scr_reset ();
1157 1265
1158 if (curr_screen >= 0) /* this is not the first time through */ 1266 if (curr_screen >= 0) /* this is not the first time through */
1159 { 1267 {
1160 scr_change_screen (curr_screen); 1268 scr_change_screen (curr_screen);
1161 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1269 selection_check (old_ncol != ncol ? 4 : 0);
1162 } 1270 }
1163 } 1271 }
1164 1272
1165 old_width = szHint.width; 1273 old_width = szHint.width;
1166 old_height = szHint.height; 1274 old_height = szHint.height;
1275
1276#ifdef XPM_BACKGROUND
1277 if (pixmap)
1278 scr_touch (false);
1279#endif
1167 1280
1168#ifdef USE_XIM 1281#ifdef USE_XIM
1169 IMSetStatusPosition (); 1282 IMSetStatusPosition ();
1170#endif 1283#endif
1171} 1284}
… …
1173/* 1286/*
1174 * 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.
1175 * good for toggling 80/132 columns 1288 * good for toggling 80/132 columns
1176 */ 1289 */
1177void 1290void
1178rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1291rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1179{ 1292{
1180 XWindowAttributes wattr; 1293 XWindowAttributes wattr;
1181 1294
1182 if (width == 0 || height == 0) 1295 if (newwidth == 0 || newheight == 0)
1183 { 1296 {
1184 XGetWindowAttributes (display->display, display->root, &wattr); 1297 XGetWindowAttributes (display->display, display->root, &wattr);
1298
1185 if (width == 0) 1299 if (newwidth == 0)
1186 width = wattr.width - szHint.base_width; 1300 newwidth = wattr.width - szHint.base_width;
1187 if (height == 0) 1301 if (newheight == 0)
1188 height = wattr.height - szHint.base_height; 1302 newheight = wattr.height - szHint.base_height;
1189 }
1190
1191 if (width != TermWin.width || height != TermWin.height)
1192 { 1303 }
1304
1305 if (newwidth != width || newheight != height)
1306 {
1193 width += szHint.base_width; 1307 newwidth += szHint.base_width;
1194 height += szHint.base_height; 1308 newheight += szHint.base_height;
1195 resize_all_windows (width, height, 0); 1309 resize_all_windows (newwidth, newheight, 0);
1196 } 1310 }
1197} 1311}
1198 1312
1199/* -------------------------------------------------------------------- * 1313/* -------------------------------------------------------------------- *
1200 * - X INPUT METHOD ROUTINES - * 1314 * - X INPUT METHOD ROUTINES - *
… …
1210 1324
1211void 1325void
1212rxvt_term::im_set_size (XRectangle &size) 1326rxvt_term::im_set_size (XRectangle &size)
1213{ 1327{
1214 // the int_bwidth terms make no sense to me 1328 // the int_bwidth terms make no sense to me
1215 size.x = TermWin.int_bwidth; 1329 size.x = int_bwidth;
1216 size.y = TermWin.int_bwidth; 1330 size.y = int_bwidth;
1217 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1331 size.width = Width2Pixel (ncol) + int_bwidth;
1218 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1332 size.height = Height2Pixel (nrow) + int_bwidth;
1219} 1333}
1220 1334
1221void 1335void
1222rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1336rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1223 XRectangle &status_rect, 1337 XRectangle &status_rect,
1224 const XRectangle &needed_rect) 1338 const XRectangle &needed_rect)
1225{ 1339{
1226 preedit_rect.x = needed_rect.width; 1340 preedit_rect.x = needed_rect.width;
1227 preedit_rect.y = 0; 1341 preedit_rect.y = 0;
1228 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1342 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1229 preedit_rect.height = TermWin.fheight; 1343 preedit_rect.height = fheight;
1230 1344
1231 status_rect.x = 0; 1345 status_rect.x = 0;
1232 status_rect.y = 0; 1346 status_rect.y = 0;
1233 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;
1234 status_rect.height = TermWin.fheight; 1348 status_rect.height = fheight;
1235} 1349}
1236 1350
1237/* Checking whether input method is running. */ 1351/* Checking whether input method is running. */
1238bool 1352bool
1239rxvt_term::IMisRunning () 1353rxvt_term::IMisRunning ()
… …
1263} 1377}
1264 1378
1265void 1379void
1266rxvt_term::IMSendSpot () 1380rxvt_term::IMSendSpot ()
1267{ 1381{
1268 XPoint spot; 1382 XPoint nspot;
1269 XVaNestedList preedit_attr; 1383 XVaNestedList preedit_attr;
1270 1384
1271 if (!Input_Context 1385 if (!Input_Context
1272 || !TermWin.focus 1386 || !focus
1273 || !(input_style & XIMPreeditPosition) 1387 || !(input_style & XIMPreeditPosition))
1274#if 0
1275 || !(event_type == KeyPress
1276 || event_type == Expose
1277 || event_type == NoExpose
1278 || event_type == SelectionNotify
1279 || event_type == ButtonRelease || event_type == FocusIn)
1280#endif
1281 || !IMisRunning ())
1282 return; 1388 return;
1283 1389
1284 im_set_position (spot); 1390 im_set_position (nspot);
1391
1392 if (nspot.x == spot.x && nspot.y == spot.y)
1393 return;
1394
1395 spot = nspot;
1285 1396
1286 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1397 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1287 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1398 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1288 XFree (preedit_attr); 1399 XFree (preedit_attr);
1289} 1400}
1290 1401
1291void 1402void
1292rxvt_term::im_destroy () 1403rxvt_term::im_destroy ()
1293{ 1404{
1294 if (Input_Context)
1295 {
1296 XDestroyIC (Input_Context);
1297 Input_Context = 0;
1298 }
1299
1300 if (input_method) 1405 if (input_method)
1301 { 1406 {
1407 if (Input_Context && input_method->xim)
1408 XDestroyIC (Input_Context);
1409
1302 display->put_xim (input_method); 1410 display->put_xim (input_method);
1303 input_method = 0; 1411 input_method = 0;
1304 } 1412 }
1413
1414 Input_Context = 0;
1305} 1415}
1306 1416
1307/* 1417/*
1308 * Try to open a XIM with the current modifiers, then see if we can 1418 * Try to open a XIM with the current modifiers, then see if we can
1309 * open a suitable preedit type 1419 * open a suitable preedit type
… …
1327 input_method = display->get_xim (locale, modifiers); 1437 input_method = display->get_xim (locale, modifiers);
1328 if (input_method == NULL) 1438 if (input_method == NULL)
1329 return false; 1439 return false;
1330 1440
1331 xim = input_method->xim; 1441 xim = input_method->xim;
1442 spot.x = spot.y = -1;
1332 1443
1333 xim_styles = NULL; 1444 xim_styles = NULL;
1334 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1445 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1335 || !xim_styles || !xim_styles->count_styles) 1446 || !xim_styles || !xim_styles->count_styles)
1336 { 1447 {
1337 im_destroy (); 1448 im_destroy ();
1338 return false; 1449 return false;
1339 } 1450 }
1340 1451
1341 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1452 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1453
1454 for (int pi = 0; pi < 2; pi++)
1455 {
1456 p = pet[pi];
1457
1458 if (!p)
1459 continue;
1460
1342 s = rxvt_splitcommastring (p); 1461 s = rxvt_splitcommastring (p);
1343 1462
1344 for (i = found = 0; !found && s[i]; i++) 1463 for (i = found = 0; !found && s[i]; i++)
1345 { 1464 {
1346 if (!strcmp (s[i], "OverTheSpot")) 1465 if (!strcmp (s[i], "OverTheSpot"))
1347 input_style = (XIMPreeditPosition | XIMStatusNothing); 1466 input_style = (XIMPreeditPosition | XIMStatusNothing);
1348 else if (!strcmp (s[i], "OffTheSpot")) 1467 else if (!strcmp (s[i], "OffTheSpot"))
1349 input_style = (XIMPreeditArea | XIMStatusArea); 1468 input_style = (XIMPreeditArea | XIMStatusArea);
1350 else if (!strcmp (s[i], "Root")) 1469 else if (!strcmp (s[i], "Root"))
1351 input_style = (XIMPreeditNothing | XIMStatusNothing); 1470 input_style = (XIMPreeditNothing | XIMStatusNothing);
1471 else if (!strcmp (s[i], "None"))
1472 input_style = (XIMPreeditNone | XIMStatusNone);
1352 1473
1353 for (j = 0; j < xim_styles->count_styles; j++) 1474 for (j = 0; j < xim_styles->count_styles; j++)
1354 if (input_style == xim_styles->supported_styles[j]) 1475 if (input_style == xim_styles->supported_styles[j])
1355 { 1476 {
1477 rxvt_freecommastring (s);
1478
1356 found = 1; 1479 found = 1;
1357 break; 1480 goto foundpet;
1481 }
1482
1358 } 1483 }
1359 }
1360 1484
1361 for (i = 0; s[i]; i++) 1485 rxvt_freecommastring (s);
1362 free (s[i]); 1486 }
1363 1487
1364 free (s); 1488foundpet:
1489
1365 XFree (xim_styles); 1490 XFree (xim_styles);
1366 1491
1367 if (!found) 1492 if (!found)
1368 { 1493 {
1369 im_destroy (); 1494 im_destroy ();
… …
1386 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1511 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1387 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1512 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1513 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1514 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "*", 1515 "*",
1391 TermWin.fheight, 1516 fheight,
1392 TermWin.fheight + 1, TermWin.fheight - 1, 1517 fheight + 1, fheight - 1,
1393 TermWin.fheight - 2, TermWin.fheight + 2); 1518 fheight - 2, fheight + 2);
1394 1519
1395 fs = XCreateFontSet (display->display, pat, 1520 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1396 &missing_charset_list, &missing_charset_count, &def_string); 1521 &missing_charset_list, &missing_charset_count, &def_string);
1397 1522
1398 if (missing_charset_list) 1523 if (missing_charset_list)
1399 XFreeStringList (missing_charset_list); 1524 XFreeStringList (missing_charset_list);
1400 1525
… …
1444 NULL); 1569 NULL);
1445 } 1570 }
1446 1571
1447 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1448 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1449 XNClientWindow, TermWin.vt, 1574 XNClientWindow, vt,
1450 XNFocusWindow, TermWin.parent[0], 1575 XNFocusWindow, parent[0],
1451 preedit_attr ? XNPreeditAttributes : NULL, 1576 preedit_attr ? XNPreeditAttributes : NULL,
1452 preedit_attr, 1577 preedit_attr,
1453 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1454 status_attr, NULL); 1579 status_attr, NULL);
1455 1580
… …
1472} 1597}
1473 1598
1474void 1599void
1475rxvt_term::im_cb () 1600rxvt_term::im_cb ()
1476{ 1601{
1477 int i, found, had_im; 1602 int i;
1478 const char *p; 1603 const char *p;
1479 char **s; 1604 char **s;
1480 char buf[IMBUFSIZ]; 1605 char buf[IMBUFSIZ];
1481 1606
1607 SET_R (this);
1608
1482 im_destroy (); 1609 im_destroy ();
1483 1610
1484 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1485 if (Input_Context) 1612 if (Input_Context)
1486 return; 1613 return;
… …
1494 if (p && *p) 1621 if (p && *p)
1495 { 1622 {
1496 bool found = false; 1623 bool found = false;
1497 1624
1498 s = rxvt_splitcommastring (p); 1625 s = rxvt_splitcommastring (p);
1626
1499 for (i = 0; s[i]; i++) 1627 for (i = 0; s[i]; i++)
1500 { 1628 {
1501 if (*s[i]) 1629 if (*s[i])
1502 { 1630 {
1503 strcpy (buf, "@im="); 1631 strcpy (buf, "@im=");
… …
1507 found = true; 1635 found = true;
1508 break; 1636 break;
1509 } 1637 }
1510 } 1638 }
1511 } 1639 }
1512 for (i = 0; s[i]; i++) 1640
1513 free (s[i]); 1641 rxvt_freecommastring (s);
1514 free (s);
1515 1642
1516 if (found) 1643 if (found)
1517 goto done; 1644 goto done;
1518 } 1645 }
1519 1646
… …
1537{ 1664{
1538 XRectangle preedit_rect, status_rect, *needed_rect; 1665 XRectangle preedit_rect, status_rect, *needed_rect;
1539 XVaNestedList preedit_attr, status_attr; 1666 XVaNestedList preedit_attr, status_attr;
1540 1667
1541 if (!Input_Context 1668 if (!Input_Context
1542 || !TermWin.focus 1669 || !focus
1543 || !(input_style & XIMPreeditArea) 1670 || !(input_style & XIMPreeditArea)
1544 || !IMisRunning ()) 1671 || !IMisRunning ())
1545 return; 1672 return;
1546 1673
1547 /* 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