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

Diff Legend

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