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.70 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.118 by root, Thu Dec 9 06:20:41 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines