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.154 by root, Sat Dec 31 17:16:17 2005 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 */
36 35
36#include <limits>
37
37#include <signal.h> 38#include <csignal>
39#include <cstring>
38 40
39#ifdef TTY_GID_SUPPORT 41#ifdef TTY_GID_SUPPORT
40# include <grp.h> 42# include <grp.h>
41#endif 43#endif
42 44
43#ifdef HAVE_TERMIOS_H 45#ifdef HAVE_TERMIOS_H
44# include <termios.h> 46# include <termios.h>
45#endif 47#endif
46 48
47#include <cstring> 49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
48 52
49vector<rxvt_term *> rxvt_term::termlist; 53vector<rxvt_term *> rxvt_term::termlist;
50 54
51static char curlocale[128]; 55static char curlocale[128];
52 56
122 126
123 return len; 127 return len;
124 128
125} 129}
126#endif 130#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 131
143rxvt_term::rxvt_term () 132rxvt_term::rxvt_term ()
144 : 133 :
145#if TRANSPARENT 134#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 135 rootwin_ev (this, &rxvt_term::rootwin_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 170 incr_ev (this, &rxvt_term::incr_cb)
182{ 171{
183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 172 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184 173
185 termlist.push_back (this); 174 termlist.push_back (this);
186}
187 175
188rxvt_term::~rxvt_term () 176#ifdef KEYSYM_RESOURCE
189{ 177 keyboard = new keyboard_manager;
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191 178
179 if (!keyboard)
180 rxvt_fatal ("out of memory, aborting.\n");
181#endif
182}
183
184// clean up the most important stuff, do *not* call x or free mem etc.
185// for use before an emergency exit
186void rxvt_term::emergency_cleanup ()
187{
192 if (cmd_pid) 188 if (cmd_pid)
193 kill (-cmd_pid, SIGHUP); 189 kill (-cmd_pid, SIGHUP);
194 190
195 pty.put ();
196
197#ifdef UTMP_SUPPORT 191#ifdef UTMP_SUPPORT
198 privileged_utmp (RESTORE); 192 privileged_utmp (RESTORE);
199#endif 193#endif
200 194
195 pty.put ();
196}
197
198rxvt_term::~rxvt_term ()
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
362 create_windows (argc, argv); 478 create_windows (argc, argv);
363 479
480 dDisp;
481
364 init_xlocale (); 482 init_xlocale ();
365 483
366 scr_reset (); /* initialize screen */ 484 scr_reset (); /* initialize screen */
367 485
368#if 0 486#if 0
369 XSynchronize (display->display, True); 487 XSynchronize (disp, True);
370#endif 488#endif
371 489
372#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar) 491 if (OPTION (Opt_scrollBar))
374 resize_scrollbar (); /* create and map scrollbar */ 492 resize_scrollbar (); /* create and map scrollbar */
375#endif 493#endif
376#if (MENUBAR_MAX) 494#if (MENUBAR_MAX)
377 if (menubar_visible ()) 495 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win); 496 XMapWindow (disp, menuBar.win);
379#endif 497#endif
380#ifdef TRANSPARENT 498#ifdef TRANSPARENT
381 if (options & Opt_transparent) 499 if (OPTION (Opt_transparent))
382 { 500 {
383 XSelectInput (display->display, display->root, PropertyChangeMask); 501 XSelectInput (disp, display->root, PropertyChangeMask);
384 check_our_parents (); 502 check_our_parents ();
385 rootwin_ev.start (display, display->root); 503 rootwin_ev.start (display, display->root);
386 } 504 }
387#endif 505#endif
388 506
389 XMapWindow (display->display, TermWin.vt); 507 XMapWindow (disp, vt);
390 XMapWindow (display->display, TermWin.parent[0]); 508 XMapWindow (disp, parent[0]);
509
510 set_colorfgbg ();
391 511
392 init_command (cmd_argv); 512 init_command (cmd_argv);
393 513
514 free (cmd_argv);
515
394 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty.pty, EVENT_READ);
395 517
396 check_ev.start (); 518 check_ev.start ();
397 519
398 return true; 520 return true;
399} 521}
400 522
401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 523static struct sig_handlers
524{
525 sig_watcher sw_chld, sw_term, sw_int;
526
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /*
542 * Catch a fatal signal and tidy up before quitting
543 */
544 void
545 sig_term (sig_watcher &w)
546 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum);
553 }
554
555 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term)
559 {
560 }
561} sig_handlers;
402 562
403void 563void
404rxvt_init () 564rxvt_init ()
405{ 565{
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 /* 566 /*
414 * Save and then give up any super-user privileges 567 * Save and then give up any super-user privileges
415 * If we need privileges in any area then we must specifically request it. 568 * If we need privileges in any area then we must specifically request it.
416 * We should only need to be root in these cases: 569 * We should only need to be root in these cases:
417 * 1. write utmp entries on some systems 570 * 1. write utmp entries on some systems
418 * 2. chown tty on some systems 571 * 2. chown tty on some systems
419 */ 572 */
420 rxvt_privileges (SAVE); 573 rxvt_privileges (SAVE);
421 rxvt_privileges (IGNORE); 574 rxvt_privileges (IGNORE);
422 575
423 struct sigaction sa; 576 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN);
424 578
425 sigfillset (&sa.sa_mask); 579 sig_handlers.sw_chld.start (SIGCHLD);
426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 580 sig_handlers.sw_term.start (SIGTERM);
427 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 581 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 582
434 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
435 /* signal (SIGURG, SIG_DFL); */ 584 /* signal (SIGURG, SIG_DFL); */
436 585
437 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 588 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} 589}
514 590
515/* ------------------------------------------------------------------------- * 591/* ------------------------------------------------------------------------- *
516 * MEMORY ALLOCATION WRAPPERS * 592 * MEMORY ALLOCATION WRAPPERS *
517 * ------------------------------------------------------------------------- */ 593 * ------------------------------------------------------------------------- */
518/* INTPROTO */ 594void *
519void *
520rxvt_malloc (size_t size) 595rxvt_malloc (size_t size)
521{ 596{
522 void *p;
523
524 p = malloc (size); 597 void *p = malloc (size);
598
525 if (p) 599 if (!p)
526 return p;
527
528 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
529 /* NOTREACHED */
530}
531 601
532/* INTPROTO */ 602 return p;
533void * 603}
604
605void *
534rxvt_calloc (size_t number, size_t size) 606rxvt_calloc (size_t number, size_t size)
535{ 607{
536 void *p;
537
538 p = calloc (number, size); 608 void *p = calloc (number, size);
609
539 if (p) 610 if (!p)
540 return p;
541
542 rxvt_fatal ("memory allocation failure. aborting.\n"); 611 rxvt_fatal ("memory allocation failure. aborting.\n");
543 /* NOTREACHED */
544}
545 612
546/* INTPROTO */ 613 return p;
614}
615
547void * 616void *
548rxvt_realloc (void *ptr, size_t size) 617rxvt_realloc (void *ptr, size_t size)
549{ 618{
550 void *p;
551
552 if (ptr)
553 p = realloc (ptr, size); 619 void *p = realloc (ptr, size);
554 else
555 p = malloc (size);
556 620
557 if (p) 621 if (!p)
558 return p;
559
560 rxvt_fatal ("memory allocation failure. aborting.\n"); 622 rxvt_fatal ("memory allocation failure. aborting.\n");
561 /* NOTREACHED */ 623
624 return p;
562} 625}
563 626
564/* ------------------------------------------------------------------------- * 627/* ------------------------------------------------------------------------- *
565 * PRIVILEGED OPERATIONS * 628 * PRIVILEGED OPERATIONS *
566 * ------------------------------------------------------------------------- */ 629 * ------------------------------------------------------------------------- */
618 681
619#ifdef UTMP_SUPPORT 682#ifdef UTMP_SUPPORT
620void 683void
621rxvt_term::privileged_utmp (rxvt_privaction action) 684rxvt_term::privileged_utmp (rxvt_privaction action)
622{ 685{
623 if ((options & Opt_utmpInhibit) 686 if (OPTION (Opt_utmpInhibit)
624 || !pty.name || !*pty.name) 687 || !pty.name || !*pty.name)
625 return; 688 return;
626 689
627 rxvt_privileges (RESTORE); 690 rxvt_privileges (RESTORE);
628 691
639/* 702/*
640 * window size/position calculcations for XSizeHint and other storage. 703 * window size/position calculcations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 704 * if width/height are non-zero then override calculated width/height
642 */ 705 */
643void 706void
644rxvt_term::window_calc (unsigned int width, unsigned int height) 707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 708{
646 short recalc_x, recalc_y; 709 short recalc_x, recalc_y;
647 int x, y, sb_w, mb_h, flags; 710 int x, y, sb_w, mb_h, flags;
648 unsigned int w, h; 711 unsigned int w, h;
649 unsigned int max_width, max_height; 712 unsigned int max_width, max_height;
713 dDisp;
650 714
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 716 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 717
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 719 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 721
658 recalc_x = recalc_y = 0; 722 recalc_x = recalc_y = 0;
659 flags = 0; 723 flags = 0;
724
660 if (!parsed_geometry) 725 if (!parsed_geometry)
661 { 726 {
662 parsed_geometry = 1; 727 parsed_geometry = 1;
728
663 if (rs[Rs_geometry]) 729 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 730 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
731
665 if (flags & WidthValue) 732 if (flags & WidthValue)
666 { 733 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 734 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 735 szHint.flags |= USSize;
669 } 736 }
737
670 if (flags & HeightValue) 738 if (flags & HeightValue)
671 { 739 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 740 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 741 szHint.flags |= USSize;
674 } 742 }
743
675 if (flags & XValue) 744 if (flags & XValue)
676 { 745 {
677 szHint.x = x; 746 szHint.x = x;
678 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
748
679 if (flags & XNegative) 749 if (flags & XNegative)
680 { 750 {
681 recalc_x = 1; 751 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 752 szHint.win_gravity = NorthEastGravity;
683 } 753 }
684 } 754 }
755
685 if (flags & YValue) 756 if (flags & YValue)
686 { 757 {
687 szHint.y = y; 758 szHint.y = y;
688 szHint.flags |= USPosition; 759 szHint.flags |= USPosition;
760
689 if (flags & YNegative) 761 if (flags & YNegative)
690 { 762 {
691 recalc_y = 1; 763 recalc_y = 1;
764
692 if (szHint.win_gravity == NorthEastGravity) 765 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 766 szHint.win_gravity = SouthEastGravity;
694 else 767 else
695 szHint.win_gravity = SouthWestGravity; 768 szHint.win_gravity = SouthWestGravity;
696 } 769 }
697 } 770 }
698 } 771 }
699 772
700 /* TODO: BOUNDS */ 773 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 774 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 775 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 776 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 777 max_height = MAX_ROWS * fheight;
705 778
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 779 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 780
708 sb_w = mb_h = 0; 781 sb_w = mb_h = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 782 window_vt_x = window_vt_y = int_bwidth;
710 783
711 if (scrollbar_visible ()) 784 if (scrollbar_visible ())
712 { 785 {
713 sb_w = scrollbar_TotalWidth (); 786 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 787 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 788 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 789 window_vt_x += sb_w;
717 } 790 }
718 791
719 if (menubar_visible ()) 792 if (menubar_visible ())
720 { 793 {
721 mb_h = menuBar_TotalHeight (); 794 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h; 795 szHint.base_height += mb_h;
723 window_vt_y += mb_h; 796 window_vt_y += mb_h;
724 } 797 }
725 798
726 szHint.width_inc = TermWin.fwidth; 799 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 800 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 801 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 802 szHint.min_height = szHint.base_height + szHint.height_inc;
730 803
731 if (width && width - szHint.base_width < max_width) 804 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 805 {
733 szHint.width = width; 806 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 807 width = newwidth - szHint.base_width;
735 } 808 }
736 else 809 else
737 { 810 {
738 MIN_IT (TermWin.width, max_width); 811 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 812 szHint.width = szHint.base_width + width;
740 } 813 }
741 814
742 if (height && height - szHint.base_height < max_height) 815 if (newheight && newheight - szHint.base_height < max_height)
743 { 816 {
744 szHint.height = height; 817 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 818 height = newheight - szHint.base_height;
746 } 819 }
747 else 820 else
748 { 821 {
749 MIN_IT (TermWin.height, max_height); 822 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 823 szHint.height = szHint.base_height + height;
751 } 824 }
752 825
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 826 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 827 window_sb_x = szHint.width - sb_w;
755 828
756 if (recalc_x) 829 if (recalc_x)
757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 831 if (recalc_y)
760 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 833
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 834 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 835 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 837 ncol, nrow, szHint.width,
767 szHint.height)); 838 szHint.height));
768 return; 839 return;
769} 840}
770 841
771/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
779 if (pty.pty < 0) 850 if (pty.pty < 0)
780 return; 851 return;
781 852
782 struct winsize ws; 853 struct winsize ws;
783 854
784 ws.ws_col = TermWin.ncol; 855 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 856 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 857 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 858 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
789 860
790#if 0 861#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 863 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 864 kill (-cmd_pid, SIGWINCH);
794#endif 865#endif
795} 866}
796 867
797/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
798/* rxvt_change_font () - Switch to a new font */ 869/* set_fonts () - load and set the various fonts
799/* 870 *
800 * init = 1 - initialize 871 * init = 1 - initialize
801 * 872 *
802 * fontname == FONT_UP - switch to bigger font 873 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 874 * fontname == FONT_DN - switch to smaller font
804 */ 875 */
805bool 876bool
806rxvt_term::change_font (const char *fontname) 877rxvt_term::set_fonts ()
807{ 878{
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); 879 rxvt_fontset *fs = new rxvt_fontset (this);
880 rxvt_fontprop prop;
819 881
820 if (fs && fs->populate (fontname ? fontname : "fixed")) 882 if (!fs
883 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
884 || !fs->realize_font (1))
885 {
886 delete fs;
887 return false;
888 }
889
890#if ENABLE_STYLES
891 for (int i = RS_styleCount; --i; )
892 if (fontset[i] != fontset[0])
893 delete fontset[i];
894#endif
895
896 delete fontset[0];
897 fontset[0] = fs;
898
899 prop = (*fs)[1]->properties ();
900 prop.height += lineSpace;
901 fs->set_prop (prop);
902
903 fwidth = prop.width;
904 fheight = prop.height;
905 fbase = (*fs)[1]->ascent;
906
907 for (int style = 1; style < 4; style++)
908 {
909#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style];
911
912 if (res && !*res)
913 fontset[style] = fontset[0];
914 else
821 { 915 {
822 delete TermWin.fontset; 916 fontset[style] = fs = new rxvt_fontset (this);
823 TermWin.fontset = fs; 917 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 918
828 if (TermWin.parent[0]) 919 if (res)
920 prop2.weight = prop2.slant = rxvt_fontprop::unset;
921 else
829 { 922 {
830 resize_all_windows (0, 0, 0); 923 res = fontset[0]->fontdesc;
831 scr_remap_chars (); 924
832 scr_touch (true); 925 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
926 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833 } 927 }
834 928
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 929 fs->populate (res);
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 930 fs->set_prop (prop2);
837
838 return true;
839 } 931 }
932#else
933 fontset[style] = fontset[0];
934#endif
935 }
936
937 if (parent[0])
840 } 938 {
939 resize_all_windows (0, 0, 0);
940 scr_remap_chars ();
941 scr_touch (true);
942 }
841 943
842 return false; 944 return true;
843} 945}
844 946
845bool 947void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846rxvt_term::font_up_down (int n, int direction)
847{ 948{
848 return false; 949 XChangeProperty (display->display, parent[0],
950 prop, XA_STRING, 8, PropModeReplace,
951 (const unsigned char *)str, len >= 0 ? len : strlen (str));
952}
953
954void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
955{
956 wchar_t *ws = rxvt_mbstowcs (str, len);
957 char *s = rxvt_wcstoutf8 (ws);
958
959 XChangeProperty (display->display, parent[0],
960 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
961 (const unsigned char *)s, strlen (s));
962
963 free (s);
964 free (ws);
849} 965}
850 966
851/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
852/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
853/* xterm sequences - title, iconName, color (exptl) */ 969/* xterm sequences - title, iconName, color (exptl) */
854void 970void
855rxvt_term::set_title (const char *str) 971rxvt_term::set_title (const char *str)
856{ 972{
857#ifdef SMART_WINDOW_TITLE 973 set_string_property (XA_WM_NAME, str);
858 char *name; 974#if ENABLE_EWMH
859 975 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 976#endif
871} 977}
872 978
873void 979void
874rxvt_term::set_icon_name (const char *str) 980rxvt_term::set_icon_name (const char *str)
875{ 981{
876#ifdef SMART_WINDOW_TITLE 982 set_string_property (XA_WM_ICON_NAME, str);
877 char *name; 983#if ENABLE_EWMH
878 984 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 985#endif
890} 986}
891 987
892#ifdef XTERM_COLOR_CHANGE 988#ifdef XTERM_COLOR_CHANGE
893void 989void
901 997
902 /* handle color aliases */ 998 /* handle color aliases */
903 if (isdigit (*color)) 999 if (isdigit (*color))
904 { 1000 {
905 i = atoi (color); 1001 i = atoi (color);
1002
906 if (i >= 8 && i <= 15) 1003 if (i >= 8 && i <= 15)
907 { /* bright colors */ 1004 { /* bright colors */
908 i -= 8; 1005 i -= 8;
909# ifndef NO_BRIGHTCOLOR 1006# ifndef NO_BRIGHTCOLOR
910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
911 SET_PIXCOLOR (idx); 1008 SET_PIXCOLOR (idx);
912 goto Done; 1009 goto done;
913# endif 1010# endif
914
915 } 1011 }
1012
916 if (i >= 0 && i <= 7) 1013 if (i >= 0 && i <= 7)
917 { /* normal colors */ 1014 { /* normal colors */
918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
919 SET_PIXCOLOR (idx); 1016 SET_PIXCOLOR (idx);
920 goto Done; 1017 goto done;
921 } 1018 }
922 } 1019 }
923 1020
924 if (!rXParseAllocColor (& xcol, color)) 1021 if (!rXParseAllocColor (&xcol, color))
925 return; 1022 return;
926 1023
927 /* XStoreColor (display->display, display->cmap, XColor*); */ 1024 /* XStoreColor (display->display, display->cmap, XColor*); */
928 1025
929 /* 1026 /*
945 pix_colors_focused[idx] = xcol; 1042 pix_colors_focused[idx] = xcol;
946 SET_PIXCOLOR (idx); 1043 SET_PIXCOLOR (idx);
947 1044
948 /* XSetWindowAttributes attr; */ 1045 /* XSetWindowAttributes attr; */
949 /* Cursor cursor; */ 1046 /* Cursor cursor; */
950Done: 1047done:
1048
951#ifdef OFF_FOCUS_FADING 1049#if OFF_FOCUS_FADING
1050 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1051 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif 1052#endif
954 if (idx == Color_bg && ! (options & Opt_transparent))
955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956 1053
957 /* handle Color_BD, scrollbar background, etc. */ 1054 /*TODO: handle Color_BD, scrollbar background, etc. */
958 1055
959 set_colorfgbg ();
960 recolour_cursor (); 1056 recolour_cursor ();
961 scr_touch (true); 1057 scr_recolour ();
962} 1058}
963 1059
964#else 1060#else
965# define set_window_color (idx,color) ((void)0) 1061# define set_window_color (idx,color) ((void)0)
966#endif /* XTERM_COLOR_CHANGE */ 1062#endif /* XTERM_COLOR_CHANGE */
968void 1064void
969rxvt_term::recolour_cursor () 1065rxvt_term::recolour_cursor ()
970{ 1066{
971 XColor xcol[2]; 1067 XColor xcol[2];
972 1068
973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg]; 1069 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]; 1070 ? pix_colors_focused[Color_pointer_fg]
1071 : pix_colors_focused[Color_fg];
1072 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1073 ? pix_colors_focused[Color_pointer_bg]
1074 : pix_colors_focused[Color_bg];
1075
975 XQueryColors (display->display, display->cmap, xcol, 2); 1076 XQueryColors (display->display, display->cmap, xcol, 2);
976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1077 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977} 1078}
978 1079
979/*----------------------------------------------------------------------*/ 1080/*----------------------------------------------------------------------*/
981 * find if fg/bg matches any of the normal (low-intensity) colors 1082 * find if fg/bg matches any of the normal (low-intensity) colors
982 */ 1083 */
983void 1084void
984rxvt_term::set_colorfgbg () 1085rxvt_term::set_colorfgbg ()
985{ 1086{
986 unsigned int i; 1087 unsigned int i;
987 const char *xpmb = "\0"; 1088 const char *xpmb = "\0";
988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1089 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989 1090
990 env_colorfgbg =
991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1091 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1092 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1093 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1094 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1095 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1096 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1097 sprintf (fstr, "%d", (i - Color_Black));
998 break; 1098 break;
999 } 1099 }
1100
1000 for (i = Color_Black; i <= Color_White; i++) 1101 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1102 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1103 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1104 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1006#endif 1107#endif
1007 break; 1108 break;
1008 } 1109 }
1009 1110
1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1111 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} 1112}
1023 1113
1024/*----------------------------------------------------------------------*/ 1114/*----------------------------------------------------------------------*/
1025/*
1026 * Colour determination for low colour displays, routine from
1027 * Hans de Goede <hans@highrise.nl>
1028 */
1029 1115
1030int 1116int
1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1117rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1032{ 1118{
1033 if (!screen_in_out->set (display, colour)) 1119 if (!screen_in_out->set (display, colour))
1041 1127
1042/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1043 * - WINDOW RESIZING - * 1129 * - WINDOW RESIZING - *
1044 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1045void 1131void
1046rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1132rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1047{ 1133{
1048 int fix_screen; 1134 int fix_screen;
1049
1050#ifdef SMART_RESIZE
1051 int old_width = szHint.width, old_height = szHint.height; 1135 int old_width = szHint.width, old_height = szHint.height;
1052#endif 1136 dDisp;
1053 1137
1054 window_calc (width, height); 1138 window_calc (newwidth, newheight);
1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1139 XSetWMNormalHints (disp, parent[0], &szHint);
1056 1140
1057 if (!ignoreparent) 1141 if (!ignoreparent)
1058 { 1142 {
1059#ifdef SMART_RESIZE 1143#ifdef SMART_RESIZE
1060 /* 1144 /*
1064 int x, y, x1, y1; 1148 int x, y, x1, y1;
1065 int dx, dy; 1149 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1150 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1151 Window unused_cr;
1068 1152
1069 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1153 XTranslateCoordinates (disp, parent[0], display->root,
1070 0, 0, &x, &y, &unused_cr); 1154 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1155 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1156 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1157 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1158 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1159 * our position for handles and decorations. Counter it
1076 */ 1160 */
1078 { 1162 {
1079 x -= x1; 1163 x -= x1;
1080 y -= y1; 1164 y -= y1;
1081 } 1165 }
1082 1166
1083 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1167 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1084 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1168 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1169 dx = old_width - szHint.width;
1086 dy = old_height - szHint.height; 1170 dy = old_height - szHint.height;
1087 1171
1088 /* Check position of the center of the window */ 1172 /* Check position of the center of the window */
1089 if (x < x1) /* left half */ 1173 if (x < x1) /* left half */
1093 if (y < y1) /* top half */ 1177 if (y < y1) /* top half */
1094 dy = 0; 1178 dy = 0;
1095 else if (y == y1) /* exact center */ 1179 else if (y == y1) /* exact center */
1096 dy /= 2; 1180 dy /= 2;
1097 1181
1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1182 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1099 szHint.width, szHint.height); 1183 szHint.width, szHint.height);
1100#else 1184#else
1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1185 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1102#endif 1186#endif
1103 } 1187 }
1104 1188
1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1190
1107 if (fix_screen || width != old_width || height != old_height) 1191 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1192 {
1109 if (scrollbar_visible ()) 1193 if (scrollbar_visible ())
1110 { 1194 {
1111 XMoveResizeWindow (display->display, scrollBar.win, 1195 XMoveResizeWindow (disp, scrollBar.win,
1112 window_sb_x, 0, 1196 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height); 1197 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar (); 1198 resize_scrollbar ();
1115 } 1199 }
1116 1200
1117 if (menubar_visible ()) 1201 if (menubar_visible ())
1118 XMoveResizeWindow (display->display, menuBar.win, 1202 XMoveResizeWindow (disp, menuBar.win,
1119 window_vt_x, 0, 1203 window_vt_x, 0,
1120 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1121 1205
1122 XMoveResizeWindow (display->display, TermWin.vt, 1206 XMoveResizeWindow (disp, vt,
1123 window_vt_x, window_vt_y, 1207 window_vt_x, window_vt_y,
1124 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1208 TermWin_TotalWidth (), TermWin_TotalHeight ());
1209
1125 scr_clear (); 1210 scr_clear ();
1126#ifdef XPM_BACKGROUND 1211#ifdef XPM_BACKGROUND
1127 resize_pixmap (); 1212 resize_pixmap ();
1128#endif 1213#endif
1129 } 1214 }
1134 int old_ncol = prev_ncol; 1219 int old_ncol = prev_ncol;
1135 1220
1136 /* scr_reset only works on the primary screen */ 1221 /* scr_reset only works on the primary screen */
1137 if (old_height) /* this is not the first time through */ 1222 if (old_height) /* this is not the first time through */
1138 { 1223 {
1139 unsigned int ncol = TermWin.ncol; 1224 unsigned int ocol = ncol;
1140 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1225 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1141 curr_screen = scr_change_screen (PRIMARY); 1226 curr_screen = scr_change_screen (PRIMARY);
1142 TermWin.ncol = ncol; 1227 ncol = ocol;
1143 } 1228 }
1144 1229
1145 scr_reset (); 1230 scr_reset ();
1146 1231
1147 if (curr_screen >= 0) /* this is not the first time through */ 1232 if (curr_screen >= 0) /* this is not the first time through */
1148 { 1233 {
1149 scr_change_screen (curr_screen); 1234 scr_change_screen (curr_screen);
1150 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1235 selection_check (old_ncol != ncol ? 4 : 0);
1151 } 1236 }
1152 } 1237 }
1153 1238
1154 old_width = szHint.width; 1239 old_width = szHint.width;
1155 old_height = szHint.height; 1240 old_height = szHint.height;
1241
1242#ifdef XPM_BACKGROUND
1243 if (pixmap)
1244 scr_touch (false);
1245#endif
1156 1246
1157#ifdef USE_XIM 1247#ifdef USE_XIM
1158 IMSetStatusPosition (); 1248 IMSetStatusPosition ();
1159#endif 1249#endif
1160} 1250}
1162/* 1252/*
1163 * Set the width/height of the vt window in characters. Units are pixels. 1253 * Set the width/height of the vt window in characters. Units are pixels.
1164 * good for toggling 80/132 columns 1254 * good for toggling 80/132 columns
1165 */ 1255 */
1166void 1256void
1167rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1257rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1168{ 1258{
1169 XWindowAttributes wattr; 1259 XWindowAttributes wattr;
1170 1260
1171 if (width == 0 || height == 0) 1261 if (newwidth == 0 || newheight == 0)
1172 { 1262 {
1173 XGetWindowAttributes (display->display, display->root, &wattr); 1263 XGetWindowAttributes (display->display, display->root, &wattr);
1264
1174 if (width == 0) 1265 if (newwidth == 0)
1175 width = wattr.width - szHint.base_width; 1266 newwidth = wattr.width - szHint.base_width;
1176 if (height == 0) 1267 if (newheight == 0)
1177 height = wattr.height - szHint.base_height; 1268 newheight = wattr.height - szHint.base_height;
1178 }
1179
1180 if (width != TermWin.width || height != TermWin.height)
1181 { 1269 }
1270
1271 if (newwidth != width || newheight != height)
1272 {
1182 width += szHint.base_width; 1273 newwidth += szHint.base_width;
1183 height += szHint.base_height; 1274 newheight += szHint.base_height;
1184 resize_all_windows (width, height, 0); 1275 resize_all_windows (newwidth, newheight, 0);
1185 } 1276 }
1186} 1277}
1187 1278
1188/* -------------------------------------------------------------------- * 1279/* -------------------------------------------------------------------- *
1189 * - X INPUT METHOD ROUTINES - * 1280 * - X INPUT METHOD ROUTINES - *
1199 1290
1200void 1291void
1201rxvt_term::im_set_size (XRectangle &size) 1292rxvt_term::im_set_size (XRectangle &size)
1202{ 1293{
1203 // the int_bwidth terms make no sense to me 1294 // the int_bwidth terms make no sense to me
1204 size.x = TermWin.int_bwidth; 1295 size.x = int_bwidth;
1205 size.y = TermWin.int_bwidth; 1296 size.y = int_bwidth;
1206 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1297 size.width = Width2Pixel (ncol) + int_bwidth;
1207 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1298 size.height = Height2Pixel (nrow) + int_bwidth;
1208} 1299}
1209 1300
1210void 1301void
1211rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1302rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1212 XRectangle &status_rect, 1303 XRectangle &status_rect,
1213 const XRectangle &needed_rect) 1304 const XRectangle &needed_rect)
1214{ 1305{
1215 preedit_rect.x = needed_rect.width; 1306 preedit_rect.x = needed_rect.width;
1216 preedit_rect.y = 0; 1307 preedit_rect.y = 0;
1217 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1308 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1218 preedit_rect.height = TermWin.fheight; 1309 preedit_rect.height = fheight;
1219 1310
1220 status_rect.x = 0; 1311 status_rect.x = 0;
1221 status_rect.y = 0; 1312 status_rect.y = 0;
1222 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1313 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1223 status_rect.height = TermWin.fheight; 1314 status_rect.height = fheight;
1224} 1315}
1225 1316
1226/* Checking whether input method is running. */ 1317/* Checking whether input method is running. */
1227bool 1318bool
1228rxvt_term::IMisRunning () 1319rxvt_term::IMisRunning ()
1252} 1343}
1253 1344
1254void 1345void
1255rxvt_term::IMSendSpot () 1346rxvt_term::IMSendSpot ()
1256{ 1347{
1257 XPoint spot; 1348 XPoint nspot;
1258 XVaNestedList preedit_attr; 1349 XVaNestedList preedit_attr;
1259 1350
1260 if (!Input_Context 1351 if (!Input_Context
1261 || !TermWin.focus 1352 || !focus
1262 || !(input_style & XIMPreeditPosition) 1353 || !(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; 1354 return;
1272 1355
1273 im_set_position (spot); 1356 im_set_position (nspot);
1357
1358 if (nspot.x == spot.x && nspot.y == spot.y)
1359 return;
1360
1361 spot = nspot;
1274 1362
1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1363 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1364 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277 XFree (preedit_attr); 1365 XFree (preedit_attr);
1278} 1366}
1279 1367
1280void 1368void
1281rxvt_term::im_destroy () 1369rxvt_term::im_destroy ()
1282{ 1370{
1283 if (Input_Context)
1284 {
1285 XDestroyIC (Input_Context);
1286 Input_Context = 0;
1287 }
1288
1289 if (input_method) 1371 if (input_method)
1290 { 1372 {
1373 if (Input_Context && input_method->xim)
1374 XDestroyIC (Input_Context);
1375
1291 display->put_xim (input_method); 1376 display->put_xim (input_method);
1292 input_method = 0; 1377 input_method = 0;
1293 } 1378 }
1379
1380 Input_Context = 0;
1294} 1381}
1295 1382
1296/* 1383/*
1297 * Try to open a XIM with the current modifiers, then see if we can 1384 * Try to open a XIM with the current modifiers, then see if we can
1298 * open a suitable preedit type 1385 * open a suitable preedit type
1316 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1317 if (input_method == NULL) 1404 if (input_method == NULL)
1318 return false; 1405 return false;
1319 1406
1320 xim = input_method->xim; 1407 xim = input_method->xim;
1408 spot.x = spot.y = -1;
1321 1409
1322 xim_styles = NULL; 1410 xim_styles = NULL;
1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1411 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324 || !xim_styles || !xim_styles->count_styles) 1412 || !xim_styles || !xim_styles->count_styles)
1325 { 1413 {
1326 im_destroy (); 1414 im_destroy ();
1327 return false; 1415 return false;
1328 } 1416 }
1329 1417
1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1418 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1419
1420 for (int pi = 0; pi < 2; pi++)
1421 {
1422 p = pet[pi];
1423
1424 if (!p)
1425 continue;
1426
1331 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1332 1428
1333 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1334 { 1430 {
1335 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1336 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = (XIMPreeditPosition | XIMStatusNothing);
1337 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1338 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = (XIMPreeditArea | XIMStatusArea);
1339 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1340 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = (XIMPreeditNothing | XIMStatusNothing);
1437 else if (!strcmp (s[i], "None"))
1438 input_style = (XIMPreeditNone | XIMStatusNone);
1341 1439
1342 for (j = 0; j < xim_styles->count_styles; j++) 1440 for (j = 0; j < xim_styles->count_styles; j++)
1343 if (input_style == xim_styles->supported_styles[j]) 1441 if (input_style == xim_styles->supported_styles[j])
1344 { 1442 {
1443 rxvt_freecommastring (s);
1444
1345 found = 1; 1445 found = 1;
1346 break; 1446 goto foundpet;
1447 }
1448
1347 } 1449 }
1348 }
1349 1450
1350 for (i = 0; s[i]; i++) 1451 rxvt_freecommastring (s);
1351 free (s[i]); 1452 }
1352 1453
1353 free (s); 1454foundpet:
1455
1354 XFree (xim_styles); 1456 XFree (xim_styles);
1355 1457
1356 if (!found) 1458 if (!found)
1357 { 1459 {
1358 im_destroy (); 1460 im_destroy ();
1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1477 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1478 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1479 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1480 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1379 "*", 1481 "*",
1380 TermWin.fheight, 1482 fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1, 1483 fheight + 1, fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2); 1484 fheight - 2, fheight + 2);
1383 1485
1384 fs = XCreateFontSet (display->display, pat, 1486 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1487 &missing_charset_list, &missing_charset_count, &def_string);
1386 1488
1387 if (missing_charset_list) 1489 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1490 XFreeStringList (missing_charset_list);
1389 1491
1433 NULL); 1535 NULL);
1434 } 1536 }
1435 1537
1436 Input_Context = XCreateIC (xim, 1538 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1539 XNInputStyle, input_style,
1438 XNClientWindow, TermWin.vt, 1540 XNClientWindow, vt,
1439 XNFocusWindow, TermWin.parent[0], 1541 XNFocusWindow, parent[0],
1440 preedit_attr ? XNPreeditAttributes : NULL, 1542 preedit_attr ? XNPreeditAttributes : NULL,
1441 preedit_attr, 1543 preedit_attr,
1442 status_attr ? XNStatusAttributes : NULL, 1544 status_attr ? XNStatusAttributes : NULL,
1443 status_attr, NULL); 1545 status_attr, NULL);
1444 1546
1461} 1563}
1462 1564
1463void 1565void
1464rxvt_term::im_cb () 1566rxvt_term::im_cb ()
1465{ 1567{
1466 int i, found, had_im; 1568 int i;
1467 const char *p; 1569 const char *p;
1468 char **s; 1570 char **s;
1469 char buf[IMBUFSIZ]; 1571 char buf[IMBUFSIZ];
1470 1572
1573 SET_R (this);
1574
1471 im_destroy (); 1575 im_destroy ();
1472 1576
1473 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1474 if (Input_Context) 1578 if (Input_Context)
1475 return; 1579 return;
1483 if (p && *p) 1587 if (p && *p)
1484 { 1588 {
1485 bool found = false; 1589 bool found = false;
1486 1590
1487 s = rxvt_splitcommastring (p); 1591 s = rxvt_splitcommastring (p);
1592
1488 for (i = 0; s[i]; i++) 1593 for (i = 0; s[i]; i++)
1489 { 1594 {
1490 if (*s[i]) 1595 if (*s[i])
1491 { 1596 {
1492 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1496 found = true; 1601 found = true;
1497 break; 1602 break;
1498 } 1603 }
1499 } 1604 }
1500 } 1605 }
1501 for (i = 0; s[i]; i++) 1606
1502 free (s[i]); 1607 rxvt_freecommastring (s);
1503 free (s);
1504 1608
1505 if (found) 1609 if (found)
1506 goto done; 1610 goto done;
1507 } 1611 }
1508 1612
1526{ 1630{
1527 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1528 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1529 1633
1530 if (!Input_Context 1634 if (!Input_Context
1531 || !TermWin.focus 1635 || !focus
1532 || !(input_style & XIMPreeditArea) 1636 || !(input_style & XIMPreeditArea)
1533 || !IMisRunning ()) 1637 || !IMisRunning ())
1534 return; 1638 return;
1535 1639
1536 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines