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

Diff Legend

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