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.80 by root, Fri Aug 13 19:31:23 2004 UTC vs.
Revision 1.128 by root, Mon Jan 17 00:59:23 2005 UTC

… …
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 "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
53bool 56bool
54rxvt_set_locale (const char *locale) 57rxvt_set_locale (const char *locale)
55{ 58{
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 59 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 60 return false;
58 61
59 STRNCPY (curlocale, locale, 128); 62 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 63 setlocale (LC_CTYPE, curlocale);
61 return true; 64 return true;
62} 65}
63 66
64#if ENABLE_COMBINING 67#if ENABLE_COMBINING
… …
123 return len; 126 return len;
124 127
125} 128}
126#endif 129#endif
127 130
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
143rxvt_term::rxvt_term () 131rxvt_term::rxvt_term ()
144 : 132 :
145#if TRANSPARENT 133#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 134 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 135#endif
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 159#endif
172#ifdef USE_XIM 160#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 161 im_ev (this, &rxvt_term::im_cb),
174#endif 162#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
175 termwin_ev (this, &rxvt_term::x_cb), 165 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 166 vt_ev (this, &rxvt_term::x_cb),
177 check_ev (this, &rxvt_term::check_cb), 167 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 168 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 169 destroy_ev (this, &rxvt_term::destroy_cb),
… …
181 incr_ev (this, &rxvt_term::incr_cb) 171 incr_ev (this, &rxvt_term::incr_cb)
182{ 172{
183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 173 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184 174
185 termlist.push_back (this); 175 termlist.push_back (this);
176
177#ifdef KEYSYM_RESOURCE
178 keyboard = new keyboard_manager;
179
180 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n");
182#endif
186} 183}
187 184
188rxvt_term::~rxvt_term () 185rxvt_term::~rxvt_term ()
189{ 186{
190 termlist.erase (find (termlist.begin (), termlist.end(), this)); 187 termlist.erase (find (termlist.begin (), termlist.end(), this));
191 188
192 if (cmd_fd >= 0) 189 if (cmd_pid)
193 close (cmd_fd); 190 kill (-cmd_pid, SIGHUP);
194 191
195#ifndef NO_SETOWNER_TTYDEV 192 pty.put ();
196 privileged_ttydev (RESTORE); 193
197#endif
198#ifdef UTMP_SUPPORT 194#ifdef UTMP_SUPPORT
199 privileged_utmp (RESTORE); 195 privileged_utmp (RESTORE);
200#endif 196#endif
201 197
198#if ENABLE_STYLES
199 for (int i = RS_styleCount; --i; )
200 if (TermWin.fontset[i] != TermWin.fontset[0])
201 delete TermWin.fontset[i];
202#endif
202 delete TermWin.fontset; 203 delete TermWin.fontset[0];
203 204
204 if (display) 205 if (display)
205 { 206 {
206 selection_clear (); 207 selection_clear ();
207 208
208#ifdef USE_XIM 209#ifdef USE_XIM
209 im_destroy (); 210 im_destroy ();
210#endif 211#endif
211#ifdef MENUBAR 212#ifdef MENUBAR
212 if (menubarGC) XFreeGC (display->display, menubarGC); 213 if (menubarGC) XFreeGC (display->display, menubarGC);
213#endif 214#endif
214#ifdef XTERM_SCROLLBAR 215#ifdef XTERM_SCROLLBAR
215 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 216 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
216 if (ShadowGC) XFreeGC (display->display, ShadowGC); 217 if (ShadowGC) XFreeGC (display->display, ShadowGC);
217#endif 218#endif
… …
248 XDestroyWindow (display->display, TermWin.parent[0]); 249 XDestroyWindow (display->display, TermWin.parent[0]);
249 } 250 }
250 251
251 // TODO: free pixcolours, colours should become part of rxvt_display 252 // TODO: free pixcolours, colours should become part of rxvt_display
252 253
253 delete PixColorsFocused; 254 delete pix_colors_focused;
254#ifdef OFF_FOCUS_FADING 255#ifdef OFF_FOCUS_FADING
255 delete PixColorsUnFocused; 256 delete pix_colors_unfocused;
256#endif 257#endif
257 258
258 displays.put (display); 259 displays.put (display);
259 260
260 scr_release (); 261 scr_release ();
… …
268 free (env_windowid); 269 free (env_windowid);
269 free (env_display); 270 free (env_display);
270 free (env_term); 271 free (env_term);
271 free (env_colorfgbg); 272 free (env_colorfgbg);
272 free (locale); 273 free (locale);
273#if 0 274 free (v_buffer);
274 free (codeset); 275 free (incr_buf);
275#endif
276 276
277 delete envv; 277 delete envv;
278 delete argv; 278 delete argv;
279
280#ifdef KEYSYM_RESOURCE
281 delete keyboard;
282#endif
279} 283}
280 284
281void 285void
282rxvt_term::destroy () 286rxvt_term::destroy ()
283{ 287{
284 if (destroy_ev.active) 288 if (destroy_ev.active)
285 return; 289 return;
290
291#if ENABLE_OVERLAY
292 scr_overlay_off ();
293#endif
286 294
287 if (display) 295 if (display)
288 { 296 {
289#if USE_XIM 297#if USE_XIM
290 im_ev.stop (display); 298 im_ev.stop (display);
… …
337bool 345bool
338rxvt_term::init (int argc, const char *const *argv) 346rxvt_term::init (int argc, const char *const *argv)
339{ 347{
340 SET_R (this); 348 SET_R (this);
341 349
350 set_locale ("");
351
342 if (!init_vars ()) 352 if (!init_vars ())
343 return false; 353 return false;
344 354
355 init_secondary ();
356
357 const char **cmd_argv = init_resources (argc, argv);
358
359#ifdef KEYSYM_RESOURCE
360 keyboard->register_done ();
361#endif
362
363#if MENUBAR_MAX
364 menubar_read (rs[Rs_menu]);
365#endif
366#ifdef HAVE_SCROLLBARS
367 if (options & Opt_scrollBar)
368 scrollBar.setIdle (); /* set existence for size calculations */
369#endif
370
371 create_windows (argc, argv);
372
373 init_xlocale ();
374
375 scr_reset (); /* initialize screen */
376
377#if 0
378 XSynchronize (display->display, True);
379#endif
380
381#ifdef HAVE_SCROLLBARS
382 if (options & Opt_scrollBar)
383 resize_scrollbar (); /* create and map scrollbar */
384#endif
385#if (MENUBAR_MAX)
386 if (menubar_visible ())
387 XMapWindow (display->display, menuBar.win);
388#endif
389#ifdef TRANSPARENT
390 if (options & Opt_transparent)
391 {
392 XSelectInput (display->display, display->root, PropertyChangeMask);
393 check_our_parents ();
394 rootwin_ev.start (display, display->root);
395 }
396#endif
397
398 XMapWindow (display->display, TermWin.vt);
399 XMapWindow (display->display, TermWin.parent[0]);
400
401 set_colorfgbg ();
402
403 init_command (cmd_argv);
404
405 free (cmd_argv);
406
407 pty_ev.start (pty.pty, EVENT_READ);
408
409 check_ev.start ();
410
411 return true;
412}
413
414static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
415
416void
417rxvt_init ()
418{
345 /* 419 /*
346 * Save and then give up any super-user privileges 420 * Save and then give up any super-user privileges
347 * If we need privileges in any area then we must specifically request it. 421 * If we need privileges in any area then we must specifically request it.
348 * We should only need to be root in these cases: 422 * We should only need to be root in these cases:
349 * 1. write utmp entries on some systems 423 * 1. write utmp entries on some systems
350 * 2. chown tty on some systems 424 * 2. chown tty on some systems
351 */ 425 */
352 privileges (SAVE); 426 rxvt_privileges (SAVE);
353 privileges (IGNORE); 427 rxvt_privileges (IGNORE);
354 428
355 init_secondary (); 429 signal (SIGHUP, SIG_IGN);
356 430 signal (SIGPIPE, SIG_IGN);
357 const char **cmd_argv = init_resources (argc, argv);
358
359 set_locale ("");
360
361#if MENUBAR_MAX
362 menubar_read (rs[Rs_menu]);
363#endif
364#ifdef HAVE_SCROLLBARS
365 if (Options & Opt_scrollBar)
366 scrollBar.setIdle (); /* set existence for size calculations */
367#endif
368
369 create_windows (argc, argv);
370
371 init_xlocale ();
372
373 scr_reset (); /* initialize screen */
374
375#if 0
376 XSynchronize (display->display, True);
377#endif
378
379#ifdef HAVE_SCROLLBARS
380 if (Options & Opt_scrollBar)
381 resize_scrollbar (); /* create and map scrollbar */
382#endif
383#if (MENUBAR_MAX)
384 if (menubar_visible ())
385 XMapWindow (display->display, menuBar.win);
386#endif
387#ifdef TRANSPARENT
388 if (Options & Opt_transparent)
389 {
390 XSelectInput (display->display, display->root, PropertyChangeMask);
391 check_our_parents ();
392 rootwin_ev.start (display, display->root);
393 }
394#endif
395
396 XMapWindow (display->display, TermWin.vt);
397 XMapWindow (display->display, TermWin.parent[0]);
398
399 init_command (cmd_argv);
400
401 pty_ev.start (cmd_fd, EVENT_READ);
402
403 check_ev.start ();
404
405 return true;
406}
407
408static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
409
410void
411rxvt_init_signals ()
412{
413 /* install exit handler for cleanup */
414#if 0
415#ifdef HAVE_ATEXIT
416 atexit (rxvt_clean_exit);
417#else
418#endif
419#endif
420
421 struct sigaction sa;
422
423 sigfillset (&sa.sa_mask);
424 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
425 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
426 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
427 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
428 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
430 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
431 431
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */ 433 /* signal (SIGURG, SIG_DFL); */
434 434
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 // TODO: handle this with exceptions and tolerate the memory loss
436 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 437 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
437} 438}
438 439
439/* ------------------------------------------------------------------------- * 440/* ------------------------------------------------------------------------- *
440 * SIGNAL HANDLING & EXIT HANDLER * 441 * SIGNAL HANDLING & EXIT HANDLER *
441 * ------------------------------------------------------------------------- */ 442 * ------------------------------------------------------------------------- */
442/* 443/*
443 * Catch a SIGCHLD signal and exit if the direct child has died 444 * Catch a SIGCHLD signal and exit if the direct child has died
444 */ 445 */
445 446
446void rxvt_term::child_exited (int pid) 447void
448rxvt_term::sig_chld (sig_watcher &w)
447{ 449{
448 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 450 // we are being called for every SIGCHLD, not just ours
449 if (pid == (*t)->cmd_pid) 451 int pid;
450 {
451 (*t)->destroy ();
452 break;
453 }
454}
455
456/* ARGSUSED */
457/* EXTPROTO */
458RETSIGTYPE
459rxvt_Child_signal (int sig __attribute__ ((unused)))
460{
461 int pid, save_errno = errno;
462 452
463 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 453 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
464 rxvt_term::child_exited (pid); 454 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
465 455 if (pid == (*t)->cmd_pid)
466 errno = save_errno; 456 {
467} 457 (*t)->destroy ();
468 458 break;
469/* 459 }
470 * Catch a fatal signal and tidy up before quitting
471 */
472/* EXTPROTO */
473RETSIGTYPE
474rxvt_Exit_signal (int sig)
475{
476 signal (sig, SIG_DFL);
477#ifdef DEBUG_CMD
478 rxvt_warn ("caught signal %d, exiting.\n", sig);
479#endif
480 rxvt_clean_exit ();
481 kill (getpid (), sig);
482}
483
484/* INTPROTO */
485int
486rxvt_xerror_handler (Display *display, XErrorEvent *event)
487{
488 if (GET_R->allowedxerror == -1)
489 GET_R->allowedxerror = event->error_code;
490 else
491 {
492 old_xerror_handler (display, event);
493 GET_R->destroy ();
494 }
495
496 return 0;
497} 460}
498 461
499/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
500/* 463/*
501 * Exit gracefully, clearing the utmp entry and restoring tty attributes 464 * Exit gracefully, clearing the utmp entry and restoring tty attributes
502 * TODO: if debugging, this should free up any known resources if we can 465 * TODO: if debugging, this should free up any known resources if we can
503 */ 466 */
504/* EXTPROTO */
505void 467void
506rxvt_clean_exit () 468rxvt_destroy_all ()
507{ 469{
508 // TODO: rxvtd should clean up all ressources 470 // TODO: rxvtd should clean up all ressources
509 if (GET_R) 471 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
472 (*t)->destroy ();
473}
474
475/*
476 * Catch a fatal signal and tidy up before quitting
477 */
478void
479rxvt_term::sig_term (sig_watcher &w)
480{
481#ifdef DEBUG_CMD
482 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
483#endif
484 rxvt_destroy_all ();
485 signal (w.signum, SIG_DFL);
486 kill (getpid (), w.signum);
487}
488
489/* INTPROTO */
490int
491rxvt_xerror_handler (Display *display, XErrorEvent *event)
492{
493 if (GET_R->allowedxerror == -1)
494 GET_R->allowedxerror = event->error_code;
495 else
496 {
497 old_xerror_handler (display, event);
510 GET_R->destroy (); 498 GET_R->destroy ();
499 }
500
501 return 0;
511} 502}
512 503
513/* ------------------------------------------------------------------------- * 504/* ------------------------------------------------------------------------- *
514 * MEMORY ALLOCATION WRAPPERS * 505 * MEMORY ALLOCATION WRAPPERS *
515 * ------------------------------------------------------------------------- */ 506 * ------------------------------------------------------------------------- */
516/* EXTPROTO */ 507void *
517void *
518rxvt_malloc (size_t size) 508rxvt_malloc (size_t size)
519{ 509{
520 void *p;
521
522 p = malloc (size); 510 void *p = malloc (size);
511
523 if (p) 512 if (!p)
513 rxvt_fatal ("memory allocation failure. aborting.\n");
514
524 return p; 515 return p;
525
526 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
527 rxvt_clean_exit ();
528 exit (EXIT_FAILURE);
529 /* NOTREACHED */
530} 516}
531 517
532/* EXTPROTO */ 518/* INTPROTO */
533void * 519void *
534rxvt_calloc (size_t number, size_t size) 520rxvt_calloc (size_t number, size_t size)
535{ 521{
536 void *p;
537
538 p = calloc (number, size); 522 void *p = calloc (number, size);
523
539 if (p) 524 if (!p)
525 rxvt_fatal ("memory allocation failure. aborting.\n");
526
540 return p; 527 return p;
541
542 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
543 rxvt_clean_exit ();
544 exit (EXIT_FAILURE);
545 /* NOTREACHED */
546} 528}
547 529
548/* EXTPROTO */ 530/* INTPROTO */
549void * 531void *
550rxvt_realloc (void *ptr, size_t size) 532rxvt_realloc (void *ptr, size_t size)
551{ 533{
552 void *p;
553
554 if (ptr)
555 p = realloc (ptr, size); 534 void *p = realloc (ptr, size);
556 else 535
557 p = malloc (size);
558 if (p) 536 if (!p)
537 rxvt_fatal ("memory allocation failure. aborting.\n");
538
559 return p; 539 return p;
560
561 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
562 rxvt_clean_exit ();
563 exit (EXIT_FAILURE);
564 /* NOTREACHED */
565} 540}
566 541
567/* ------------------------------------------------------------------------- * 542/* ------------------------------------------------------------------------- *
568 * PRIVILEGED OPERATIONS * 543 * PRIVILEGED OPERATIONS *
569 * ------------------------------------------------------------------------- */ 544 * ------------------------------------------------------------------------- */
570/* take care of suid/sgid super-user (root) privileges */ 545/* take care of suid/sgid super-user (root) privileges */
571void 546void
572rxvt_term::privileges (int mode) 547rxvt_privileges (rxvt_privaction action)
573{ 548{
549#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
550 static uid_t euid;
551 static gid_t egid;
552#endif
553
574#if ! defined(__CYGWIN32__) 554#if ! defined(__CYGWIN32__)
575# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 555# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
576 /* setreuid () is the poor man's setuid (), seteuid () */ 556 /* setreuid () is the poor man's setuid (), seteuid () */
577# define seteuid(a) setreuid(-1, (a)) 557# define seteuid(a) setreuid(-1, (a))
578# define setegid(a) setregid(-1, (a)) 558# define setegid(a) setregid(-1, (a))
579# define HAVE_SETEUID 559# define HAVE_SETEUID
580# endif 560# endif
581# ifdef HAVE_SETEUID 561# ifdef HAVE_SETEUID
582 switch (mode) 562 switch (action)
583 { 563 {
584 case IGNORE: 564 case IGNORE:
585 /* 565 /*
586 * change effective uid/gid - not real uid/gid - so we can switch 566 * change effective uid/gid - not real uid/gid - so we can switch
587 * back to root later, as required 567 * back to root later, as required
… …
597 seteuid (euid); 577 seteuid (euid);
598 setegid (egid); 578 setegid (egid);
599 break; 579 break;
600 } 580 }
601# else 581# else
602 switch (mode) 582 switch (action)
603 { 583 {
604 case IGNORE: 584 case IGNORE:
605 setuid (getuid ()); 585 setuid (getuid ());
606 setgid (getgid ()); 586 setgid (getgid ());
607 /* FALLTHROUGH */ 587 /* FALLTHROUGH */
… …
614#endif 594#endif
615} 595}
616 596
617#ifdef UTMP_SUPPORT 597#ifdef UTMP_SUPPORT
618void 598void
619rxvt_term::privileged_utmp (char action) 599rxvt_term::privileged_utmp (rxvt_privaction action)
620{ 600{
621 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
622 action, next_utmp_action, getpid ()));
623 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
624 || (Options & Opt_utmpInhibit) 601 if ((options & Opt_utmpInhibit)
625 || ttydev == NULL || *ttydev == '\0') 602 || !pty.name || !*pty.name)
626 return; 603 return;
627 604
628 privileges (RESTORE); 605 rxvt_privileges (RESTORE);
606
629 if (action == SAVE) 607 if (action == SAVE)
630 {
631 next_utmp_action = RESTORE;
632 makeutent (ttydev, rs[Rs_display_name]); 608 makeutent (pty.name, rs[Rs_display_name]);
633 }
634 else 609 else
635 { /* action == RESTORE */
636 next_utmp_action = IGNORE;
637 cleanutent (); 610 cleanutent ();
638 } 611
639 privileges (IGNORE); 612 rxvt_privileges (IGNORE);
640}
641#endif
642
643#ifndef NO_SETOWNER_TTYDEV
644void
645rxvt_term::privileged_ttydev (char action)
646{
647 D_MAIN ((stderr,
648 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
649 action, next_tty_action, getpid ()));
650 if (next_tty_action != action || (action != SAVE && action != RESTORE)
651 || ttydev == NULL || *ttydev == '\0')
652 return;
653
654 privileges (RESTORE);
655
656 if (action == SAVE)
657 {
658 next_tty_action = RESTORE;
659# ifndef RESET_TTY_TO_COMMON_DEFAULTS
660 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
661 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
662 next_tty_action = IGNORE;
663 else
664# endif
665
666 {
667 chown (ttydev, getuid (), ttygid); /* fail silently */
668 chmod (ttydev, ttymode);
669# ifdef HAVE_REVOKE
670 revoke (ttydev);
671# endif
672
673 }
674 }
675 else
676 { /* action == RESTORE */
677 next_tty_action = IGNORE;
678# ifndef RESET_TTY_TO_COMMON_DEFAULTS
679 chmod (ttydev, ttyfd_stat.st_mode);
680 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
681# else
682 chmod (ttydev,
683 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
684 chown (ttydev, 0, 0);
685# endif
686
687 }
688
689 privileges (IGNORE);
690
691# ifndef RESET_TTY_TO_COMMON_DEFAULTS
692 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
693 action == RESTORE ? "Restoring" : (action ==
694 SAVE ? "Saving" :
695 "UNKNOWN ERROR for"), ttydev,
696 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
697 ttyfd_stat.st_gid));
698# endif
699} 613}
700#endif 614#endif
701 615
702/*----------------------------------------------------------------------*/ 616/*----------------------------------------------------------------------*/
703/* 617/*
… …
774 688
775 if (scrollbar_visible ()) 689 if (scrollbar_visible ())
776 { 690 {
777 sb_w = scrollbar_TotalWidth (); 691 sb_w = scrollbar_TotalWidth ();
778 szHint.base_width += sb_w; 692 szHint.base_width += sb_w;
779 if (!(Options & Opt_scrollBar_right)) 693 if (!(options & Opt_scrollBar_right))
780 window_vt_x += sb_w; 694 window_vt_x += sb_w;
781 } 695 }
782 696
783 if (menubar_visible ()) 697 if (menubar_visible ())
784 { 698 {
… …
812 { 726 {
813 MIN_IT (TermWin.height, max_height); 727 MIN_IT (TermWin.height, max_height);
814 szHint.height = szHint.base_height + TermWin.height; 728 szHint.height = szHint.base_height + TermWin.height;
815 } 729 }
816 730
817 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 731 if (scrollbar_visible () && (options & Opt_scrollBar_right))
818 window_sb_x = szHint.width - sb_w; 732 window_sb_x = szHint.width - sb_w;
819 733
820 if (recalc_x) 734 if (recalc_x)
821 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 735 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
822 - szHint.width - 2 * TermWin.ext_bwidth); 736 - szHint.width - 2 * TermWin.ext_bwidth);
… …
838 * Called after a window size change. 752 * Called after a window size change.
839 */ 753 */
840void 754void
841rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
842{ 756{
757 if (pty.pty < 0)
758 return;
759
843 struct winsize ws; 760 struct winsize ws;
844
845 if (cmd_fd < 0)
846 return;
847 761
848 ws.ws_col = TermWin.ncol; 762 ws.ws_col = TermWin.ncol;
849 ws.ws_row = TermWin.nrow; 763 ws.ws_row = TermWin.nrow;
850 ws.ws_xpixel = ws.ws_ypixel = 0; 764 ws.ws_xpixel = TermWin.width;
851#ifndef DEBUG_SIZE 765 ws.ws_ypixel = TermWin.height;
852 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 766 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
853#else 767
854 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 768#if 0
855 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
856# ifdef SIGWINCH
857 else if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
858 kill (cmd_pid, SIGWINCH); 771 kill (cmd_pid, SIGWINCH);
859# endif
860#endif 772#endif
861} 773}
862 774
863/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
864/* rxvt_change_font () - Switch to a new font */ 776/* set_fonts () - load and set the various fonts
865/* 777/*
866 * init = 1 - initialize 778 * init = 1 - initialize
867 * 779 *
868 * fontname == FONT_UP - switch to bigger font 780 * fontname == FONT_UP - switch to bigger font
869 * fontname == FONT_DN - switch to smaller font 781 * fontname == FONT_DN - switch to smaller font
870 */ 782 */
871bool 783bool
872rxvt_term::change_font (const char *fontname) 784rxvt_term::set_fonts ()
873{ 785{
874 if (fontname == FONT_UP)
875 {
876 // TODO
877 }
878 else if (fontname == FONT_DN)
879 {
880 // TODO
881 }
882 else
883 {
884 rxvt_fontset *fs = new rxvt_fontset (this); 786 rxvt_fontset *fs = new rxvt_fontset (this);
787 rxvt_fontprop prop;
885 788
886 if (fs && fs->populate (fontname ? fontname : "fixed")) 789 if (!fs
790 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
791 || !fs->realize_font (1))
792 {
793 delete fs;
794 return false;
795 }
796
797#if ENABLE_STYLES
798 for (int i = RS_styleCount; --i; )
799 if (TermWin.fontset[i] != TermWin.fontset[0])
800 delete TermWin.fontset[i];
801#endif
802
803 delete TermWin.fontset[0];
804 TermWin.fontset[0] = fs;
805
806 prop = (*fs)[1]->properties ();
807 prop.height += TermWin.lineSpace;
808 fs->set_prop (prop);
809
810 TermWin.fwidth = prop.width;
811 TermWin.fheight = prop.height;
812 TermWin.fweight = prop.weight;
813 TermWin.fslant = prop.slant;
814 TermWin.fbase = (*fs)[1]->ascent;
815
816 for (int style = 1; style < 4; style++)
817 {
818#if ENABLE_STYLES
819 const char *res = rs[Rs_font + style];
820
821 if (res && !*res)
822 TermWin.fontset[style] = TermWin.fontset[0];
823 else
887 { 824 {
888 delete TermWin.fontset; 825 TermWin.fontset[style] = fs = new rxvt_fontset (this);
889 TermWin.fontset = fs; 826 rxvt_fontprop prop2 = prop;
890 TermWin.fwidth = fs->base_font ()->width;
891 TermWin.fheight = fs->base_font ()->height;
892 TermWin.fbase = fs->base_font ()->ascent;
893 827
894 if (TermWin.parent[0]) 828 if (res)
829 prop2.weight = prop2.slant = rxvt_fontprop::unset;
830 else
895 { 831 {
896 resize_all_windows (0, 0, 0); 832 res = TermWin.fontset[0]->fontdesc;
897 scr_remap_chars (); 833
898 scr_touch (true); 834 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
835 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
899 } 836 }
900 837
901 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 838 fs->populate (res);
902 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 839 fs->set_prop (prop2);
903
904 return true;
905 } 840 }
841#else
842 TermWin.fontset[style] = TermWin.fontset[0];
843#endif
844 }
845
846 if (TermWin.parent[0])
906 } 847 {
848 resize_all_windows (0, 0, 0);
849 scr_remap_chars ();
850 scr_touch (true);
851 }
907 852
908 return false; 853 return true;
909} 854}
910 855
911bool 856void rxvt_term::set_string_property (Atom prop, const char *str, int len)
912rxvt_term::font_up_down (int n, int direction)
913{ 857{
914 return false; 858 // TODO: SMART_WINDOW_TITLE
859 XChangeProperty (display->display, TermWin.parent[0],
860 prop, XA_STRING, 8, PropModeReplace,
861 (const unsigned char *)str, len >= 0 ? len : strlen (str));
862}
863
864void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
865{
866 // TODO: SMART_WINDOW_TITLE
867 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws);
869
870 XChangeProperty (display->display, TermWin.parent[0],
871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
872 (const unsigned char *)s, strlen (s));
873
874 free (s);
875 free (ws);
915} 876}
916 877
917/*----------------------------------------------------------------------*/ 878/*----------------------------------------------------------------------*/
918/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
919/* xterm sequences - title, iconName, color (exptl) */ 880/* xterm sequences - title, iconName, color (exptl) */
920void 881void
921rxvt_term::set_title (const char *str) 882rxvt_term::set_title (const char *str)
922{ 883{
923#ifdef SMART_WINDOW_TITLE 884 set_string_property (XA_WM_NAME, str);
924 char *name; 885#if ENABLE_FRILLS
925 886 set_utf8_property (xa[XA_NET_WM_NAME], str);
926 if (!XFetchName (display->display, TermWin.parent[0], &name))
927 name = NULL;
928
929 if (name == NULL || STRCMP (name, str))
930#endif
931 XStoreName (display->display, TermWin.parent[0], str);
932
933#ifdef SMART_WINDOW_TITLE
934 if (name)
935 XFree (name);
936#endif 887#endif
937} 888}
938 889
939void 890void
940rxvt_term::set_icon_name (const char *str) 891rxvt_term::set_icon_name (const char *str)
941{ 892{
942#ifdef SMART_WINDOW_TITLE 893 set_string_property (XA_WM_ICON_NAME, str);
943 char *name; 894#if ENABLE_FRILLS
944 895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
945 if (!XGetIconName (display->display, TermWin.parent[0], &name))
946 name = NULL;
947
948 if (name == NULL || STRCMP (name, str))
949#endif
950 XSetIconName (display->display, TermWin.parent[0], str);
951
952#ifdef SMART_WINDOW_TITLE
953 if (name)
954 XFree (name);
955#endif 896#endif
956} 897}
957 898
958#ifdef XTERM_COLOR_CHANGE 899#ifdef XTERM_COLOR_CHANGE
959void 900void
… …
971 i = atoi (color); 912 i = atoi (color);
972 if (i >= 8 && i <= 15) 913 if (i >= 8 && i <= 15)
973 { /* bright colors */ 914 { /* bright colors */
974 i -= 8; 915 i -= 8;
975# ifndef NO_BRIGHTCOLOR 916# ifndef NO_BRIGHTCOLOR
976 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
977 SET_PIXCOLOR (idx); 918 SET_PIXCOLOR (idx);
978 goto Done; 919 goto Done;
979# endif 920# endif
980 921
981 } 922 }
982 if (i >= 0 && i <= 7) 923 if (i >= 0 && i <= 7)
983 { /* normal colors */ 924 { /* normal colors */
984 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i]; 925 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985 SET_PIXCOLOR (idx); 926 SET_PIXCOLOR (idx);
986 goto Done; 927 goto Done;
987 } 928 }
988 } 929 }
989 930
… …
996 * FIXME: should free colors here, but no idea how to do it so instead, 937 * FIXME: should free colors here, but no idea how to do it so instead,
997 * so just keep gobbling up the colormap 938 * so just keep gobbling up the colormap
998 */ 939 */
999# if 0 940# if 0
1000 for (i = Color_Black; i <= Color_White; i++) 941 for (i = Color_Black; i <= Color_White; i++)
1001 if (PixColors[idx] == PixColors[i]) 942 if (pix_colors[idx] == pix_colors[i])
1002 break; 943 break;
1003 if (i > Color_White) 944 if (i > Color_White)
1004 { 945 {
1005 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 946 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1006 XFreeColors (display->display, display->cmap, (PixColors + idx), 1, 947 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1007 DisplayPlanes (display->display, display->screen)); 948 DisplayPlanes (display->display, display->screen));
1008 } 949 }
1009# endif 950# endif
1010 951
1011 PixColorsFocused[idx] = xcol; 952 pix_colors_focused[idx] = xcol;
1012 SET_PIXCOLOR (idx); 953 SET_PIXCOLOR (idx);
1013 954
1014 /* XSetWindowAttributes attr; */ 955 /* XSetWindowAttributes attr; */
1015 /* Cursor cursor; */ 956 /* Cursor cursor; */
1016Done: 957Done:
1017#ifdef OFF_FOCUS_FADING 958#ifdef OFF_FOCUS_FADING
959 if (rs[Rs_fade])
1018 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade])); 960 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1019#endif 961#endif
1020 if (idx == Color_bg && ! (Options & Opt_transparent))
1021 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1022 962
1023 /* handle Color_BD, scrollbar background, etc. */ 963 /*TODO: handle Color_BD, scrollbar background, etc. */
1024 964
1025 set_colorfgbg ();
1026 recolour_cursor (); 965 recolour_cursor ();
1027 scr_touch (true); 966 scr_recolour ();
1028} 967}
1029 968
1030#else 969#else
1031# define set_window_color (idx,color) ((void)0) 970# define set_window_color (idx,color) ((void)0)
1032#endif /* XTERM_COLOR_CHANGE */ 971#endif /* XTERM_COLOR_CHANGE */
… …
1034void 973void
1035rxvt_term::recolour_cursor () 974rxvt_term::recolour_cursor ()
1036{ 975{
1037 XColor xcol[2]; 976 XColor xcol[2];
1038 977
1039 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg]; 978 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1040 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg]; 979 ? pix_colors_focused[Color_pointer_fg]
980 : pix_colors_focused[Color_fg];
981 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
982 ? pix_colors_focused[Color_pointer_bg]
983 : pix_colors_focused[Color_bg];
984
1041 XQueryColors (display->display, display->cmap, xcol, 2); 985 XQueryColors (display->display, display->cmap, xcol, 2);
1042 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 986 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1043} 987}
1044 988
1045/*----------------------------------------------------------------------*/ 989/*----------------------------------------------------------------------*/
… …
1047 * find if fg/bg matches any of the normal (low-intensity) colors 991 * find if fg/bg matches any of the normal (low-intensity) colors
1048 */ 992 */
1049void 993void
1050rxvt_term::set_colorfgbg () 994rxvt_term::set_colorfgbg ()
1051{ 995{
1052 unsigned int i; 996 unsigned int i;
1053 const char *xpmb = "\0"; 997 const char *xpmb = "\0";
1054 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 998 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1055 999
1056 env_colorfgbg =
1057 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1000 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1058 STRCPY (fstr, "default"); 1001 strcpy (fstr, "default");
1059 STRCPY (bstr, "default"); 1002 strcpy (bstr, "default");
1060 for (i = Color_Black; i <= Color_White; i++) 1003 for (i = Color_Black; i <= Color_White; i++)
1061 if (PixColors[Color_fg] == PixColors[i]) 1004 if (pix_colors[Color_fg] == pix_colors[i])
1062 { 1005 {
1063 sprintf (fstr, "%d", (i - Color_Black)); 1006 sprintf (fstr, "%d", (i - Color_Black));
1064 break; 1007 break;
1065 } 1008 }
1009
1066 for (i = Color_Black; i <= Color_White; i++) 1010 for (i = Color_Black; i <= Color_White; i++)
1067 if (PixColors[Color_bg] == PixColors[i]) 1011 if (pix_colors[Color_bg] == pix_colors[i])
1068 { 1012 {
1069 sprintf (bstr, "%d", (i - Color_Black)); 1013 sprintf (bstr, "%d", (i - Color_Black));
1070#ifdef XPM_BACKGROUND 1014#ifdef XPM_BACKGROUND
1071 xpmb = "default;"; 1015 xpmb = "default;";
1072#endif 1016#endif
1073 break; 1017 break;
1074 } 1018 }
1075 1019
1076 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1020 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1077
1078#ifndef NO_BRIGHTCOLOR
1079 colorfgbg = DEFAULT_RSTYLE;
1080 for (i = minCOLOR; i <= maxCOLOR; i++)
1081 {
1082 if (PixColors[Color_fg] == PixColors[i])
1083 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1084 if (PixColors[Color_bg] == PixColors[i])
1085 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1086 }
1087#endif
1088} 1021}
1089 1022
1090/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
1091/*
1092 * Colour determination for low colour displays, routine from
1093 * Hans de Goede <hans@highrise.nl>
1094 */
1095 1024
1096int 1025int
1097rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1026rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1098{ 1027{
1099 if (!screen_in_out->set (display, colour)) 1028 if (!screen_in_out->set (display, colour))
… …
1255 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1256 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1257#ifdef USE_XIM 1186#ifdef USE_XIM
1258 1187
1259void 1188void
1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1190{
1191 fg = pix_colors[Color_fg];
1192 bg = pix_colors[Color_bg];
1193}
1194
1195void
1260rxvt_term::im_set_size (XRectangle *size) 1196rxvt_term::im_set_size (XRectangle &size)
1261{ 1197{
1198 // the int_bwidth terms make no sense to me
1262 size->x = TermWin.int_bwidth; 1199 size.x = TermWin.int_bwidth;
1263 size->y = TermWin.int_bwidth; 1200 size.y = TermWin.int_bwidth;
1264 size->width = Width2Pixel (TermWin.ncol); 1201 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1265 size->height = Height2Pixel (TermWin.nrow); 1202 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1266} 1203}
1267 1204
1268void 1205void
1269rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1206rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1207 XRectangle &status_rect,
1208 const XRectangle &needed_rect)
1270{ 1209{
1271 *fg = PixColors[Color_fg]; 1210 preedit_rect.x = needed_rect.width;
1272 *bg = PixColors[Color_bg]; 1211 preedit_rect.y = 0;
1212 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1213 preedit_rect.height = TermWin.fheight;
1214
1215 status_rect.x = 0;
1216 status_rect.y = 0;
1217 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1218 status_rect.height = TermWin.fheight;
1273} 1219}
1274 1220
1275/* Checking whether input method is running. */ 1221/* Checking whether input method is running. */
1276bool 1222bool
1277rxvt_term::IMisRunning () 1223rxvt_term::IMisRunning ()
1278{ 1224{
1279 char *p; 1225 char *p;
1280 Atom atom; 1226 Atom atom;
1281 Window win; 1227 Window win;
1282 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1283 1229
1284 /* get current locale modifier */ 1230 /* get current locale modifier */
1285 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1231 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1286 { 1232 {
1287 STRCPY (server, "@server="); 1233 strcpy (server, "@server=");
1288 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1234 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1235
1289 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1236 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1290 *p = '\0'; 1237 *p = '\0';
1291 1238
1292 atom = XInternAtom (display->display, server, False); 1239 atom = XInternAtom (display->display, server, False);
1293 win = XGetSelectionOwner (display->display, atom); 1240 win = XGetSelectionOwner (display->display, atom);
1241
1294 if (win != None) 1242 if (win != None)
1295 return True; 1243 return True;
1296 } 1244 }
1245
1297 return False; 1246 return False;
1298} 1247}
1299 1248
1300void 1249void
1301rxvt_term::IMSendSpot () 1250rxvt_term::IMSendSpot ()
1302{ 1251{
1303 XPoint spot; 1252 XPoint nspot;
1304 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1305 1254
1306 if (Input_Context == NULL 1255 if (!Input_Context
1256 || !TermWin.focus
1307 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1257 || !(input_style & XIMPreeditPosition))
1308 || ! (event_type == KeyPress
1309 || event_type == Expose
1310 || event_type == NoExpose
1311 || event_type == SelectionNotify
1312 || event_type == ButtonRelease || event_type == FocusIn)
1313 || !IMisRunning ())
1314 return; 1258 return;
1315 1259
1316 im_set_position (&spot); 1260 im_set_position (nspot);
1261
1262 if (nspot.x == spot.x && nspot.y == spot.y)
1263 return;
1264
1265 spot = nspot;
1317 1266
1318 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1267 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1319 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1268 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1320 XFree (preedit_attr); 1269 XFree (preedit_attr);
1321} 1270}
1322 1271
1323void 1272void
1324rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1325 XRectangle * needed_rect)
1326{
1327 int mbh, vtx = 0;
1328
1329 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1330 vtx = scrollbar_TotalWidth ();
1331
1332 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1333 mbh -= TermWin.lineSpace;
1334
1335 preedit_rect->x = needed_rect->width + vtx;
1336 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1337
1338 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1339 preedit_rect->height = Height2Pixel (1);
1340
1341 status_rect->x = vtx;
1342 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1343
1344 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1345 status_rect->height = Height2Pixel (1);
1346}
1347
1348void
1349rxvt_term::im_destroy () 1273rxvt_term::im_destroy ()
1350{ 1274{
1351 if (Input_Context)
1352 {
1353 XDestroyIC (Input_Context);
1354 Input_Context = NULL;
1355 }
1356
1357 if (input_method) 1275 if (input_method)
1358 { 1276 {
1277 if (Input_Context && input_method->xim)
1278 XDestroyIC (Input_Context);
1279
1359 display->put_xim (input_method); 1280 display->put_xim (input_method);
1360 input_method = 0; 1281 input_method = 0;
1361 } 1282 }
1283
1284 Input_Context = 0;
1362} 1285}
1363 1286
1364/* 1287/*
1365 * Try to open a XIM with the current modifiers, then see if we can 1288 * Try to open a XIM with the current modifiers, then see if we can
1366 * open a suitable preedit type 1289 * open a suitable preedit type
1367 */ 1290 */
1368bool 1291bool
1369rxvt_term::IM_get_IC (const char *modifiers) 1292rxvt_term::IM_get_IC (const char *modifiers)
1370{ 1293{
1371 int i, j, found; 1294 int i, j, found;
1372 XIM xim; 1295 XIM xim;
1373 XPoint spot; 1296 XPoint spot;
1374 XRectangle rect, status_rect, needed_rect; 1297 XRectangle rect, status_rect, needed_rect;
1375 unsigned long fg, bg; 1298 unsigned long fg, bg;
1376 const char *p; 1299 const char *p;
1377 char **s; 1300 char **s;
1378 XIMStyles *xim_styles; 1301 XIMStyles *xim_styles;
1379 XVaNestedList preedit_attr, status_attr;
1380 1302
1381 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1303 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1382 return false; 1304 return false;
1383 1305
1384 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1306 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1385 input_method = display->get_xim (locale, modifiers); 1307 input_method = display->get_xim (locale, modifiers);
1386 if (input_method == NULL) 1308 if (input_method == NULL)
1387 return false; 1309 return false;
1388 1310
1389 xim = input_method->xim; 1311 xim = input_method->xim;
1312 spot.x = spot.y = -1;
1390 1313
1391 xim_styles = NULL; 1314 xim_styles = NULL;
1392 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1315 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1393 || !xim_styles || !xim_styles->count_styles) 1316 || !xim_styles || !xim_styles->count_styles)
1394 { 1317 {
1395 display->put_xim (input_method); 1318 im_destroy ();
1396 return false; 1319 return false;
1397 } 1320 }
1398 1321
1399 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1322 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1323
1324 for (int pi = 0; pi < 2; pi++)
1325 {
1326 p = pet[pi];
1327
1328 if (!p)
1329 continue;
1330
1400 s = rxvt_splitcommastring (p); 1331 s = rxvt_splitcommastring (p);
1332
1401 for (i = found = 0; !found && s[i]; i++) 1333 for (i = found = 0; !found && s[i]; i++)
1402 { 1334 {
1403 if (!STRCMP (s[i], "OverTheSpot")) 1335 if (!strcmp (s[i], "OverTheSpot"))
1404 input_style = (XIMPreeditPosition | XIMStatusNothing); 1336 input_style = (XIMPreeditPosition | XIMStatusNothing);
1405 else if (!STRCMP (s[i], "OffTheSpot")) 1337 else if (!strcmp (s[i], "OffTheSpot"))
1406 input_style = (XIMPreeditArea | XIMStatusArea); 1338 input_style = (XIMPreeditArea | XIMStatusArea);
1407 else if (!STRCMP (s[i], "Root")) 1339 else if (!strcmp (s[i], "Root"))
1408 input_style = (XIMPreeditNothing | XIMStatusNothing); 1340 input_style = (XIMPreeditNothing | XIMStatusNothing);
1341 else if (!strcmp (s[i], "None"))
1342 input_style = (XIMPreeditNone | XIMStatusNone);
1409 1343
1410 for (j = 0; j < xim_styles->count_styles; j++) 1344 for (j = 0; j < xim_styles->count_styles; j++)
1411 if (input_style == xim_styles->supported_styles[j]) 1345 if (input_style == xim_styles->supported_styles[j])
1412 { 1346 {
1347 rxvt_freecommastring (s);
1348
1413 found = 1; 1349 found = 1;
1414 break; 1350 goto foundpet;
1351 }
1352
1415 } 1353 }
1416 }
1417 1354
1418 for (i = 0; s[i]; i++) 1355 rxvt_freecommastring (s);
1419 free (s[i]); 1356 }
1420 1357
1421 free (s); 1358foundpet:
1359
1422 XFree (xim_styles); 1360 XFree (xim_styles);
1423 1361
1424 if (!found) 1362 if (!found)
1425 { 1363 {
1426 display->put_xim (input_method); 1364 im_destroy ();
1427 return false; 1365 return false;
1428 } 1366 }
1429 1367
1430 preedit_attr = status_attr = NULL; 1368 XFontSet fs = 0;
1369 XVaNestedList preedit_attr = 0, status_attr = 0;
1370
1371 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1372 {
1373 // fake us a font-set, please
1374 char **missing_charset_list;
1375 int missing_charset_count;
1376 char *def_string;
1377 char pat[512];
1378
1379 sprintf (pat,
1380 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1381 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1382 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1383 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1384 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1385 "*",
1386 TermWin.fheight,
1387 TermWin.fheight + 1, TermWin.fheight - 1,
1388 TermWin.fheight - 2, TermWin.fheight + 2);
1389
1390 fs = XCreateFontSet (display->display, pat,
1391 &missing_charset_list, &missing_charset_count, &def_string);
1392
1393 if (missing_charset_list)
1394 XFreeStringList (missing_charset_list);
1395
1396 if (!fs)
1397 {
1398 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1399 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1400 }
1401 }
1431 1402
1432 if (input_style & XIMPreeditPosition) 1403 if (input_style & XIMPreeditPosition)
1433 { 1404 {
1434 im_set_size (&rect); 1405 im_set_size (rect);
1435 im_set_position (&spot); 1406 im_set_position (spot);
1436 im_set_color (&fg, &bg); 1407 im_set_color (fg, bg);
1437 1408
1438 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1409 preedit_attr = XVaCreateNestedList (0,
1410 XNForeground, fg,
1411 XNBackground, bg,
1412 XNArea, &rect,
1439 XNSpotLocation, &spot, 1413 XNSpotLocation, &spot,
1440 XNForeground, fg, XNBackground, bg,
1441 //XNFontSet, TermWin.fontset, 1414 XNFontSet, fs,
1442 NULL); 1415 NULL);
1443 } 1416 }
1444 else if (input_style & XIMPreeditArea) 1417 else if (input_style & XIMPreeditArea)
1445 { 1418 {
1446 im_set_color (&fg, &bg); 1419 im_set_color (fg, bg);
1447 1420
1448 /* 1421 /*
1449 * The necessary width of preedit area is unknown 1422 * The necessary width of preedit area is unknown
1450 * until create input context. 1423 * until create input context.
1451 */ 1424 */
1452 needed_rect.width = 0; 1425 needed_rect.width = 0;
1453
1454 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1426 im_set_preedit_area (rect, status_rect, needed_rect);
1455 1427
1456 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1428 preedit_attr = XVaCreateNestedList (0,
1429 XNForeground, fg,
1457 XNForeground, fg, XNBackground, bg, 1430 XNBackground, bg,
1431 XNArea, &rect,
1432 XNFontSet, fs,
1433 NULL);
1434 status_attr = XVaCreateNestedList (0,
1435 XNForeground, fg,
1436 XNBackground, bg,
1437 XNArea, &status_rect,
1458 //XNFontSet, TermWin.fontset, 1438 XNFontSet, fs,
1459 NULL); 1439 NULL);
1460 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1461 XNForeground, fg, XNBackground, bg,
1462 //XNFontSet, TermWin.fontset,
1463 NULL);
1464 } 1440 }
1465 1441
1466 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1442 Input_Context = XCreateIC (xim,
1443 XNInputStyle, input_style,
1467 XNClientWindow, TermWin.parent[0], 1444 XNClientWindow, TermWin.vt,
1468 XNFocusWindow, TermWin.parent[0], 1445 XNFocusWindow, TermWin.parent[0],
1469 preedit_attr ? XNPreeditAttributes : NULL, 1446 preedit_attr ? XNPreeditAttributes : NULL,
1470 preedit_attr, 1447 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1448 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1449 status_attr, NULL);
1450
1473 if (preedit_attr) XFree (preedit_attr); 1451 if (preedit_attr) XFree (preedit_attr);
1474 if (status_attr) XFree (status_attr); 1452 if (status_attr) XFree (status_attr);
1453 if (fs) XFreeFontSet (display->display, fs);
1475 1454
1476 if (Input_Context == NULL) 1455 if (Input_Context == NULL)
1477 { 1456 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1457 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 display->put_xim (input_method); 1458 im_destroy ();
1480 return false; 1459 return false;
1481 } 1460 }
1482 1461
1483 if (input_style & XIMPreeditArea) 1462 if (input_style & XIMPreeditArea)
1484 IMSetStatusPosition (); 1463 IMSetStatusPosition ();
… …
1510 if (p && *p) 1489 if (p && *p)
1511 { 1490 {
1512 bool found = false; 1491 bool found = false;
1513 1492
1514 s = rxvt_splitcommastring (p); 1493 s = rxvt_splitcommastring (p);
1494
1515 for (i = 0; s[i]; i++) 1495 for (i = 0; s[i]; i++)
1516 { 1496 {
1517 if (*s[i]) 1497 if (*s[i])
1518 { 1498 {
1519 STRCPY (buf, "@im="); 1499 strcpy (buf, "@im=");
1520 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1500 strncat (buf, s[i], IMBUFSIZ - 5);
1521 if (IM_get_IC (buf)) 1501 if (IM_get_IC (buf))
1522 { 1502 {
1523 found = true; 1503 found = true;
1524 break; 1504 break;
1525 } 1505 }
1526 } 1506 }
1527 } 1507 }
1528 for (i = 0; s[i]; i++) 1508
1529 free (s[i]); 1509 rxvt_freecommastring (s);
1530 free (s);
1531 1510
1532 if (found) 1511 if (found)
1533 goto done; 1512 goto done;
1534 } 1513 }
1535 1514
… …
1549} 1528}
1550 1529
1551void 1530void
1552rxvt_term::IMSetStatusPosition () 1531rxvt_term::IMSetStatusPosition ()
1553{ 1532{
1554 XRectangle preedit_rect, status_rect, *needed_rect; 1533 XRectangle preedit_rect, status_rect, *needed_rect;
1555 XVaNestedList preedit_attr, status_attr; 1534 XVaNestedList preedit_attr, status_attr;
1556 1535
1557 if (Input_Context == NULL 1536 if (!Input_Context
1537 || !TermWin.focus
1558 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1538 || !(input_style & XIMPreeditArea)
1559 || !IMisRunning ()) 1539 || !IMisRunning ())
1560 return; 1540 return;
1561 1541
1562 /* Getting the necessary width of preedit area */ 1542 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1543 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1544 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1545 XFree (status_attr);
1566 1546
1567 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1547 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1548 XFree (needed_rect);
1568 1549
1569 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1550 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1570 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1551 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1571 1552
1572 XSetICValues (Input_Context, 1553 XSetICValues (Input_Context,
1573 XNPreeditAttributes, preedit_attr, 1554 XNPreeditAttributes, preedit_attr,
1574 XNStatusAttributes, status_attr, NULL); 1555 XNStatusAttributes, status_attr, NULL);
1575 1556
1576 XFree (preedit_attr); 1557 XFree (preedit_attr);
1577 XFree (status_attr); 1558 XFree (status_attr);
1578} 1559}
1579#endif /* USE_XIM */ 1560#endif /* USE_XIM */

Diff Legend

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