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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines