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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines