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.120 by root, Mon Dec 13 19:16:36 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
259 free (env_windowid); 259 free (env_windowid);
260 free (env_display); 260 free (env_display);
261 free (env_term); 261 free (env_term);
262 free (env_colorfgbg); 262 free (env_colorfgbg);
263 free (locale); 263 free (locale);
264#if 0 264 free (v_buffer);
265 free (codeset); 265 free (incr_buf);
266#endif
267 266
268 delete envv; 267 delete envv;
269 delete argv; 268 delete argv;
270} 269}
271 270
272void 271void
273rxvt_term::destroy () 272rxvt_term::destroy ()
274{ 273{
274 if (destroy_ev.active)
275 return;
276
277#if ENABLE_OVERLAY
278 scr_overlay_off ();
279#endif
280
275 if (display) 281 if (display)
276 { 282 {
283#if USE_XIM
284 im_ev.stop (display);
285#endif
286#if HAVE_SCROLLBARS
287 scrollbar_ev.stop (display);
288#endif
289#if MENUBAR
290 menubar_ev.stop (display);
291#endif
292#if TRANSPARENT
277 rootwin_ev.stop (display); 293 rootwin_ev.stop (display);
294#endif
295 incr_ev.stop ();
278 termwin_ev.stop (display); 296 termwin_ev.stop (display);
279 vt_ev.stop (display); 297 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 } 298 }
291 299
292 check_ev.stop (); 300 check_ev.stop ();
293 pty_ev.stop (); 301 pty_ev.stop ();
294#ifdef CURSOR_BLINK 302#ifdef CURSOR_BLINK
326 SET_R (this); 334 SET_R (this);
327 335
328 if (!init_vars ()) 336 if (!init_vars ())
329 return false; 337 return false;
330 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{
331 /* 399 /*
332 * Save and then give up any super-user privileges 400 * Save and then give up any super-user privileges
333 * 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.
334 * We should only need to be root in these cases: 402 * We should only need to be root in these cases:
335 * 1. write utmp entries on some systems 403 * 1. write utmp entries on some systems
336 * 2. chown tty on some systems 404 * 2. chown tty on some systems
337 */ 405 */
338 privileges (SAVE); 406 rxvt_privileges (SAVE);
339 privileges (IGNORE); 407 rxvt_privileges (IGNORE);
340 408
341 init_secondary (); 409 signal (SIGHUP, SIG_IGN);
342 410 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 411
419 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 412 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
420 /* signal (SIGURG, SIG_DFL); */ 413 /* signal (SIGURG, SIG_DFL); */
421 414
422 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
423 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 417 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
424} 418}
425 419
426/* ------------------------------------------------------------------------- * 420/* ------------------------------------------------------------------------- *
427 * SIGNAL HANDLING & EXIT HANDLER * 421 * SIGNAL HANDLING & EXIT HANDLER *
428 * ------------------------------------------------------------------------- */ 422 * ------------------------------------------------------------------------- */
429/* 423/*
430 * 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
431 */ 425 */
432 426
433void rxvt_term::child_exited (int pid) 427void
428rxvt_term::sig_chld (sig_watcher &w)
434{ 429{
435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 430 // we are being called for every SIGCHLD, not just ours
436 if (pid == (*t)->cmd_pid) 431 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 432
450 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 433 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
451 rxvt_term::child_exited (pid); 434 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
452 435 if (pid == (*t)->cmd_pid)
453 errno = save_errno; 436 {
454} 437 (*t)->destroy ();
455 438 break;
456/* 439 }
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} 440}
485 441
486/*----------------------------------------------------------------------*/ 442/*----------------------------------------------------------------------*/
487/* 443/*
488 * Exit gracefully, clearing the utmp entry and restoring tty attributes 444 * Exit gracefully, clearing the utmp entry and restoring tty attributes
489 * 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
490 */ 446 */
491/* EXTPROTO */
492void 447void
493rxvt_clean_exit () 448rxvt_destroy_all ()
494{ 449{
495 // TODO: rxvtd should clean up all ressources 450 // TODO: rxvtd should clean up all ressources
496 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);
497 GET_R->destroy (); 478 GET_R->destroy ();
479 }
480
481 return 0;
498} 482}
499 483
500/* ------------------------------------------------------------------------- * 484/* ------------------------------------------------------------------------- *
501 * MEMORY ALLOCATION WRAPPERS * 485 * MEMORY ALLOCATION WRAPPERS *
502 * ------------------------------------------------------------------------- */ 486 * ------------------------------------------------------------------------- */
503/* EXTPROTO */ 487void *
504void *
505rxvt_malloc (size_t size) 488rxvt_malloc (size_t size)
506{ 489{
507 void *p;
508
509 p = malloc (size); 490 void *p = malloc (size);
491
510 if (p) 492 if (!p)
493 rxvt_fatal ("memory allocation failure. aborting.\n");
494
511 return p; 495 return p;
512
513 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
514 rxvt_clean_exit ();
515 exit (EXIT_FAILURE);
516 /* NOTREACHED */
517} 496}
518 497
519/* EXTPROTO */ 498/* INTPROTO */
520void * 499void *
521rxvt_calloc (size_t number, size_t size) 500rxvt_calloc (size_t number, size_t size)
522{ 501{
523 void *p;
524
525 p = calloc (number, size); 502 void *p = calloc (number, size);
503
526 if (p) 504 if (!p)
505 rxvt_fatal ("memory allocation failure. aborting.\n");
506
527 return p; 507 return p;
528
529 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
530 rxvt_clean_exit ();
531 exit (EXIT_FAILURE);
532 /* NOTREACHED */
533} 508}
534 509
535/* EXTPROTO */ 510/* INTPROTO */
536void * 511void *
537rxvt_realloc (void *ptr, size_t size) 512rxvt_realloc (void *ptr, size_t size)
538{ 513{
539 void *p;
540
541 if (ptr)
542 p = realloc (ptr, size); 514 void *p = realloc (ptr, size);
543 else 515
544 p = malloc (size);
545 if (p) 516 if (!p)
517 rxvt_fatal ("memory allocation failure. aborting.\n");
518
546 return p; 519 return p;
547
548 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
549 rxvt_clean_exit ();
550 exit (EXIT_FAILURE);
551 /* NOTREACHED */
552} 520}
553 521
554/* ------------------------------------------------------------------------- * 522/* ------------------------------------------------------------------------- *
555 * PRIVILEGED OPERATIONS * 523 * PRIVILEGED OPERATIONS *
556 * ------------------------------------------------------------------------- */ 524 * ------------------------------------------------------------------------- */
557/* take care of suid/sgid super-user (root) privileges */ 525/* take care of suid/sgid super-user (root) privileges */
558void 526void
559rxvt_term::privileges (int mode) 527rxvt_privileges (rxvt_privaction action)
560{ 528{
529#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
530 static uid_t euid;
531 static gid_t egid;
532#endif
533
561#if ! defined(__CYGWIN32__) 534#if ! defined(__CYGWIN32__)
562# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 535# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
563 /* setreuid () is the poor man's setuid (), seteuid () */ 536 /* setreuid () is the poor man's setuid (), seteuid () */
564# define seteuid(a) setreuid(-1, (a)) 537# define seteuid(a) setreuid(-1, (a))
565# define setegid(a) setregid(-1, (a)) 538# define setegid(a) setregid(-1, (a))
566# define HAVE_SETEUID 539# define HAVE_SETEUID
567# endif 540# endif
568# ifdef HAVE_SETEUID 541# ifdef HAVE_SETEUID
569 switch (mode) 542 switch (action)
570 { 543 {
571 case IGNORE: 544 case IGNORE:
572 /* 545 /*
573 * 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
574 * back to root later, as required 547 * back to root later, as required
584 seteuid (euid); 557 seteuid (euid);
585 setegid (egid); 558 setegid (egid);
586 break; 559 break;
587 } 560 }
588# else 561# else
589 switch (mode) 562 switch (action)
590 { 563 {
591 case IGNORE: 564 case IGNORE:
592 setuid (getuid ()); 565 setuid (getuid ());
593 setgid (getgid ()); 566 setgid (getgid ());
594 /* FALLTHROUGH */ 567 /* FALLTHROUGH */
601#endif 574#endif
602} 575}
603 576
604#ifdef UTMP_SUPPORT 577#ifdef UTMP_SUPPORT
605void 578void
606rxvt_term::privileged_utmp (char action) 579rxvt_term::privileged_utmp (rxvt_privaction action)
607{ 580{
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) 581 if ((options & Opt_utmpInhibit)
612 || ttydev == NULL || *ttydev == '\0') 582 || !pty.name || !*pty.name)
613 return; 583 return;
614 584
615 privileges (RESTORE); 585 rxvt_privileges (RESTORE);
586
616 if (action == SAVE) 587 if (action == SAVE)
617 {
618 next_utmp_action = RESTORE;
619 makeutent (ttydev, rs[Rs_display_name]); 588 makeutent (pty.name, rs[Rs_display_name]);
620 }
621 else 589 else
622 { /* action == RESTORE */
623 next_utmp_action = IGNORE;
624 cleanutent (); 590 cleanutent ();
625 } 591
626 privileges (IGNORE); 592 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} 593}
687#endif 594#endif
688 595
689/*----------------------------------------------------------------------*/ 596/*----------------------------------------------------------------------*/
690/* 597/*
761 668
762 if (scrollbar_visible ()) 669 if (scrollbar_visible ())
763 { 670 {
764 sb_w = scrollbar_TotalWidth (); 671 sb_w = scrollbar_TotalWidth ();
765 szHint.base_width += sb_w; 672 szHint.base_width += sb_w;
766 if (!(Options & Opt_scrollBar_right)) 673 if (!(options & Opt_scrollBar_right))
767 window_vt_x += sb_w; 674 window_vt_x += sb_w;
768 } 675 }
769 676
770 if (menubar_visible ()) 677 if (menubar_visible ())
771 { 678 {
799 { 706 {
800 MIN_IT (TermWin.height, max_height); 707 MIN_IT (TermWin.height, max_height);
801 szHint.height = szHint.base_height + TermWin.height; 708 szHint.height = szHint.base_height + TermWin.height;
802 } 709 }
803 710
804 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 711 if (scrollbar_visible () && (options & Opt_scrollBar_right))
805 window_sb_x = szHint.width - sb_w; 712 window_sb_x = szHint.width - sb_w;
806 713
807 if (recalc_x) 714 if (recalc_x)
808 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 715 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
809 - szHint.width - 2 * TermWin.ext_bwidth); 716 - szHint.width - 2 * TermWin.ext_bwidth);
825 * Called after a window size change. 732 * Called after a window size change.
826 */ 733 */
827void 734void
828rxvt_term::tt_winch () 735rxvt_term::tt_winch ()
829{ 736{
737 if (pty.pty < 0)
738 return;
739
830 struct winsize ws; 740 struct winsize ws;
831
832 if (cmd_fd < 0)
833 return;
834 741
835 ws.ws_col = TermWin.ncol; 742 ws.ws_col = TermWin.ncol;
836 ws.ws_row = TermWin.nrow; 743 ws.ws_row = TermWin.nrow;
837 ws.ws_xpixel = ws.ws_ypixel = 0; 744 ws.ws_xpixel = TermWin.width;
838#ifndef DEBUG_SIZE 745 ws.ws_ypixel = TermWin.height;
839 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 746 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
840#else 747
841 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 748#if 0
842 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 749 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
843# ifdef SIGWINCH
844 else if (cmd_pid) /* force through to the command */ 750 if (cmd_pid) /* force through to the command */
845 kill (cmd_pid, SIGWINCH); 751 kill (cmd_pid, SIGWINCH);
846# endif
847#endif 752#endif
848} 753}
849 754
850/*----------------------------------------------------------------------*/ 755/*----------------------------------------------------------------------*/
851/* rxvt_change_font () - Switch to a new font */ 756/* set_fonts () - load and set the various fonts
852/* 757/*
853 * init = 1 - initialize 758 * init = 1 - initialize
854 * 759 *
855 * fontname == FONT_UP - switch to bigger font 760 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 761 * fontname == FONT_DN - switch to smaller font
857 */ 762 */
858bool 763bool
859rxvt_term::change_font (const char *fontname) 764rxvt_term::set_fonts ()
860{ 765{
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); 766 rxvt_fontset *fs = new rxvt_fontset (this);
767 rxvt_fontprop prop;
872 768
873 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
874 { 803 {
875 delete TermWin.fontset; 804 TermWin.fontset[style] = fs = new rxvt_fontset (this);
876 TermWin.fontset = fs; 805 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 806
881 if (TermWin.parent[0]) 807 if (res)
808 prop2.weight = prop2.slant = rxvt_fontprop::unset;
809 else
882 { 810 {
883 resize_all_windows (0, 0, 0); 811 res = TermWin.fontset[0]->fontdesc;
884 scr_remap_chars (); 812
885 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;
886 } 815 }
887 816
888 return true; 817 fs->populate (res);
818 fs->set_prop (prop2);
889 } 819 }
820#else
821 TermWin.fontset[style] = TermWin.fontset[0];
822#endif
823 }
824
825 if (TermWin.parent[0])
890 } 826 {
827 resize_all_windows (0, 0, 0);
828 scr_remap_chars ();
829 scr_touch (true);
830 }
891 831
892 return false; 832 return true;
893} 833}
894 834
895bool 835void rxvt_term::set_string_property (Atom prop, const char *str, int len)
896rxvt_term::font_up_down (int n, int direction)
897{ 836{
898 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);
899} 855}
900 856
901/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
902/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
903/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
904void 860void
905rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
906{ 862{
907#ifdef SMART_WINDOW_TITLE 863 set_string_property (XA_WM_NAME, str);
908 char *name; 864#if ENABLE_FRILLS
909 865 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 866#endif
921} 867}
922 868
923void 869void
924rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
925{ 871{
926#ifdef SMART_WINDOW_TITLE 872 set_string_property (XA_WM_ICON_NAME, str);
927 char *name; 873#if ENABLE_FRILLS
928 874 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 875#endif
940} 876}
941 877
942#ifdef XTERM_COLOR_CHANGE 878#ifdef XTERM_COLOR_CHANGE
943void 879void
955 i = atoi (color); 891 i = atoi (color);
956 if (i >= 8 && i <= 15) 892 if (i >= 8 && i <= 15)
957 { /* bright colors */ 893 { /* bright colors */
958 i -= 8; 894 i -= 8;
959# ifndef NO_BRIGHTCOLOR 895# ifndef NO_BRIGHTCOLOR
960 PixColors[idx] = PixColors[minBrightCOLOR + i]; 896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
961 SET_PIXCOLOR (idx); 897 SET_PIXCOLOR (idx);
962 goto Done; 898 goto Done;
963# endif 899# endif
964 900
965 } 901 }
966 if (i >= 0 && i <= 7) 902 if (i >= 0 && i <= 7)
967 { /* normal colors */ 903 { /* normal colors */
968 PixColors[idx] = PixColors[minCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
969 SET_PIXCOLOR (idx); 905 SET_PIXCOLOR (idx);
970 goto Done; 906 goto Done;
971 } 907 }
972 } 908 }
973 909
974 if (!rXParseAllocColor (& xcol, color)) 910 if (!rXParseAllocColor (& xcol, color))
975 return; 911 return;
976 912
977 /* XStoreColor (display->display, XCMAP, XColor*); */ 913 /* XStoreColor (display->display, display->cmap, XColor*); */
978 914
979 /* 915 /*
980 * 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,
981 * so just keep gobbling up the colormap 917 * so just keep gobbling up the colormap
982 */ 918 */
983# if 0 919# if 0
984 for (i = Color_Black; i <= Color_White; i++) 920 for (i = Color_Black; i <= Color_White; i++)
985 if (PixColors[idx] == PixColors[i]) 921 if (pix_colors[idx] == pix_colors[i])
986 break; 922 break;
987 if (i > Color_White) 923 if (i > Color_White)
988 { 924 {
989 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 925 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
990 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 926 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
991 DisplayPlanes (display->display, display->screen)); 927 DisplayPlanes (display->display, display->screen));
992 } 928 }
993# endif 929# endif
994 930
995 PixColors[idx] = xcol; 931 pix_colors_focused[idx] = xcol;
996 SET_PIXCOLOR (idx); 932 SET_PIXCOLOR (idx);
997 933
998 /* XSetWindowAttributes attr; */ 934 /* XSetWindowAttributes attr; */
999 /* Cursor cursor; */ 935 /* Cursor cursor; */
1000Done: 936Done:
1001 if (idx == Color_bg && ! (Options & Opt_transparent)) 937#ifdef OFF_FOCUS_FADING
1002 XSetWindowBackground (display->display, TermWin.vt, 938 if (rs[Rs_fade])
1003 PixColors[Color_bg]); 939 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
940#endif
1004 941
1005 /* handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
1006 943
1007 set_colorfgbg ();
1008 recolour_cursor (); 944 recolour_cursor ();
1009 scr_touch (true); 945 scr_recolour ();
1010} 946}
1011 947
1012#else 948#else
1013# define set_window_color (idx,color) ((void)0) 949# define set_window_color (idx,color) ((void)0)
1014#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
1016void 952void
1017rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
1018{ 954{
1019 XColor xcol[2]; 955 XColor xcol[2];
1020 956
1021 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg]; 957 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[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
1023 XQueryColors (display->display, XCMAP, xcol, 2); 964 XQueryColors (display->display, display->cmap, xcol, 2);
1024 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 965 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1025} 966}
1026 967
1027/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
1028/* 969/*
1029 * 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
1030 */ 971 */
1031void 972void
1032rxvt_term::set_colorfgbg () 973rxvt_term::set_colorfgbg ()
1033{ 974{
1034 unsigned int i; 975 unsigned int i;
1035 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037 978
1038 env_colorfgbg =
1039 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1040 STRCPY (fstr, "default"); 980 strcpy (fstr, "default");
1041 STRCPY (bstr, "default"); 981 strcpy (bstr, "default");
1042 for (i = Color_Black; i <= Color_White; i++) 982 for (i = Color_Black; i <= Color_White; i++)
1043 if (PixColors[Color_fg] == PixColors[i]) 983 if (pix_colors[Color_fg] == pix_colors[i])
1044 { 984 {
1045 sprintf (fstr, "%d", (i - Color_Black)); 985 sprintf (fstr, "%d", (i - Color_Black));
1046 break; 986 break;
1047 } 987 }
988
1048 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1049 if (PixColors[Color_bg] == PixColors[i]) 990 if (pix_colors[Color_bg] == pix_colors[i])
1050 { 991 {
1051 sprintf (bstr, "%d", (i - Color_Black)); 992 sprintf (bstr, "%d", (i - Color_Black));
1052#ifdef XPM_BACKGROUND 993#ifdef XPM_BACKGROUND
1053 xpmb = "default;"; 994 xpmb = "default;";
1054#endif 995#endif
1055 break; 996 break;
1056 } 997 }
1057 998
1058 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 999 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} 1000}
1071 1001
1072/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
1073/* 1003/*
1074 * Colour determination for low colour displays, routine from 1004 * Colour determination for low colour displays, routine from
1222 if (width == 0) 1152 if (width == 0)
1223 width = wattr.width - szHint.base_width; 1153 width = wattr.width - szHint.base_width;
1224 if (height == 0) 1154 if (height == 0)
1225 height = wattr.height - szHint.base_height; 1155 height = wattr.height - szHint.base_height;
1226 } 1156 }
1157
1227 if (width != TermWin.width || height != TermWin.height) 1158 if (width != TermWin.width || height != TermWin.height)
1228 { 1159 {
1229 width += szHint.base_width; 1160 width += szHint.base_width;
1230 height += szHint.base_height; 1161 height += szHint.base_height;
1231 resize_all_windows (width, height, 0); 1162 resize_all_windows (width, height, 0);
1236 * - X INPUT METHOD ROUTINES - * 1167 * - X INPUT METHOD ROUTINES - *
1237 * -------------------------------------------------------------------- */ 1168 * -------------------------------------------------------------------- */
1238#ifdef USE_XIM 1169#ifdef USE_XIM
1239 1170
1240void 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
1241rxvt_term::im_set_size (XRectangle *size) 1179rxvt_term::im_set_size (XRectangle &size)
1242{ 1180{
1181 // the int_bwidth terms make no sense to me
1243 size->x = TermWin.int_bwidth; 1182 size.x = TermWin.int_bwidth;
1244 size->y = TermWin.int_bwidth; 1183 size.y = TermWin.int_bwidth;
1245 size->width = Width2Pixel (TermWin.ncol); 1184 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1246 size->height = Height2Pixel (TermWin.nrow); 1185 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1247} 1186}
1248 1187
1249void 1188void
1250rxvt_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)
1251{ 1192{
1252 *fg = PixColors[Color_fg]; 1193 preedit_rect.x = needed_rect.width;
1253 *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;
1254} 1202}
1255 1203
1256/* Checking whether input method is running. */ 1204/* Checking whether input method is running. */
1257bool 1205bool
1258rxvt_term::IMisRunning () 1206rxvt_term::IMisRunning ()
1259{ 1207{
1260 char *p; 1208 char *p;
1261 Atom atom; 1209 Atom atom;
1262 Window win; 1210 Window win;
1263 char server[IMBUFSIZ]; 1211 char server[IMBUFSIZ];
1264 1212
1265 /* get current locale modifier */ 1213 /* get current locale modifier */
1266 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1214 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1267 { 1215 {
1268 STRCPY (server, "@server="); 1216 strcpy (server, "@server=");
1269 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1217 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1218
1270 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1219 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1271 *p = '\0'; 1220 *p = '\0';
1272 1221
1273 atom = XInternAtom (display->display, server, False); 1222 atom = XInternAtom (display->display, server, False);
1274 win = XGetSelectionOwner (display->display, atom); 1223 win = XGetSelectionOwner (display->display, atom);
1224
1275 if (win != None) 1225 if (win != None)
1276 return True; 1226 return True;
1277 } 1227 }
1228
1278 return False; 1229 return False;
1279} 1230}
1280 1231
1281void 1232void
1282rxvt_term::IMSendSpot () 1233rxvt_term::IMSendSpot ()
1283{ 1234{
1284 XPoint spot; 1235 XPoint nspot;
1285 XVaNestedList preedit_attr; 1236 XVaNestedList preedit_attr;
1286 1237
1287 if (Input_Context == NULL 1238 if (!Input_Context
1239 || !TermWin.focus
1288 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1240 || !(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; 1241 return;
1296 1242
1297 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;
1298 1249
1299 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1250 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1300 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1251 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1301 XFree (preedit_attr); 1252 XFree (preedit_attr);
1302} 1253}
1303 1254
1304void 1255void
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 () 1256rxvt_term::im_destroy ()
1331{ 1257{
1332 if (Input_Context)
1333 {
1334 XDestroyIC (Input_Context);
1335 Input_Context = NULL;
1336 }
1337
1338 if (input_method) 1258 if (input_method)
1339 { 1259 {
1260 if (Input_Context && input_method->xim)
1261 XDestroyIC (Input_Context);
1262
1340 display->put_xim (input_method); 1263 display->put_xim (input_method);
1341 input_method = 0; 1264 input_method = 0;
1342 } 1265 }
1266
1267 Input_Context = 0;
1343} 1268}
1344 1269
1345/* 1270/*
1346 * 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
1347 * open a suitable preedit type 1272 * open a suitable preedit type
1348 */ 1273 */
1349bool 1274bool
1350rxvt_term::IM_get_IC (const char *modifiers) 1275rxvt_term::IM_get_IC (const char *modifiers)
1351{ 1276{
1352 int i, j, found; 1277 int i, j, found;
1353 XIM xim; 1278 XIM xim;
1354 XPoint spot; 1279 XPoint spot;
1355 XRectangle rect, status_rect, needed_rect; 1280 XRectangle rect, status_rect, needed_rect;
1356 unsigned long fg, bg; 1281 unsigned long fg, bg;
1357 const char *p; 1282 const char *p;
1358 char **s; 1283 char **s;
1359 XIMStyles *xim_styles; 1284 XIMStyles *xim_styles;
1360 XVaNestedList preedit_attr, status_attr;
1361 1285
1362 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1286 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1363 return false; 1287 return false;
1364 1288
1365 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1289 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1366 input_method = display->get_xim (locale, modifiers); 1290 input_method = display->get_xim (locale, modifiers);
1367 if (input_method == NULL) 1291 if (input_method == NULL)
1368 return false; 1292 return false;
1369 1293
1370 xim = input_method->xim; 1294 xim = input_method->xim;
1295 spot.x = spot.y = -1;
1371 1296
1372 xim_styles = NULL; 1297 xim_styles = NULL;
1373 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1298 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1374 || !xim_styles || !xim_styles->count_styles) 1299 || !xim_styles || !xim_styles->count_styles)
1375 { 1300 {
1376 display->put_xim (input_method); 1301 im_destroy ();
1377 return false; 1302 return false;
1378 } 1303 }
1379 1304
1380 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
1381 s = rxvt_splitcommastring (p); 1314 s = rxvt_splitcommastring (p);
1315
1382 for (i = found = 0; !found && s[i]; i++) 1316 for (i = found = 0; !found && s[i]; i++)
1383 { 1317 {
1384 if (!STRCMP (s[i], "OverTheSpot")) 1318 if (!strcmp (s[i], "OverTheSpot"))
1385 input_style = (XIMPreeditPosition | XIMStatusNothing); 1319 input_style = (XIMPreeditPosition | XIMStatusNothing);
1386 else if (!STRCMP (s[i], "OffTheSpot")) 1320 else if (!strcmp (s[i], "OffTheSpot"))
1387 input_style = (XIMPreeditArea | XIMStatusArea); 1321 input_style = (XIMPreeditArea | XIMStatusArea);
1388 else if (!STRCMP (s[i], "Root")) 1322 else if (!strcmp (s[i], "Root"))
1389 input_style = (XIMPreeditNothing | XIMStatusNothing); 1323 input_style = (XIMPreeditNothing | XIMStatusNothing);
1324 else if (!strcmp (s[i], "None"))
1325 input_style = (XIMPreeditNone | XIMStatusNone);
1390 1326
1391 for (j = 0; j < xim_styles->count_styles; j++) 1327 for (j = 0; j < xim_styles->count_styles; j++)
1392 if (input_style == xim_styles->supported_styles[j]) 1328 if (input_style == xim_styles->supported_styles[j])
1393 { 1329 {
1330 rxvt_freecommastring (s);
1331
1394 found = 1; 1332 found = 1;
1395 break; 1333 goto foundpet;
1334 }
1335
1396 } 1336 }
1397 }
1398 1337
1399 for (i = 0; s[i]; i++) 1338 rxvt_freecommastring (s);
1400 free (s[i]); 1339 }
1401 1340
1402 free (s); 1341foundpet:
1342
1403 XFree (xim_styles); 1343 XFree (xim_styles);
1404 1344
1405 if (!found) 1345 if (!found)
1406 { 1346 {
1407 display->put_xim (input_method); 1347 im_destroy ();
1408 return false; 1348 return false;
1409 } 1349 }
1410 1350
1411 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 }
1412 1385
1413 if (input_style & XIMPreeditPosition) 1386 if (input_style & XIMPreeditPosition)
1414 { 1387 {
1415 im_set_size (&rect); 1388 im_set_size (rect);
1416 im_set_position (&spot); 1389 im_set_position (spot);
1417 im_set_color (&fg, &bg); 1390 im_set_color (fg, bg);
1418 1391
1419 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1392 preedit_attr = XVaCreateNestedList (0,
1393 XNForeground, fg,
1394 XNBackground, bg,
1395 XNArea, &rect,
1420 XNSpotLocation, &spot, 1396 XNSpotLocation, &spot,
1421 XNForeground, fg, XNBackground, bg,
1422 //XNFontSet, TermWin.fontset, 1397 XNFontSet, fs,
1423 NULL); 1398 NULL);
1424 } 1399 }
1425 else if (input_style & XIMPreeditArea) 1400 else if (input_style & XIMPreeditArea)
1426 { 1401 {
1427 im_set_color (&fg, &bg); 1402 im_set_color (fg, bg);
1428 1403
1429 /* 1404 /*
1430 * The necessary width of preedit area is unknown 1405 * The necessary width of preedit area is unknown
1431 * until create input context. 1406 * until create input context.
1432 */ 1407 */
1433 needed_rect.width = 0; 1408 needed_rect.width = 0;
1434
1435 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1409 im_set_preedit_area (rect, status_rect, needed_rect);
1436 1410
1437 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1411 preedit_attr = XVaCreateNestedList (0,
1412 XNForeground, fg,
1438 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,
1439 //XNFontSet, TermWin.fontset, 1421 XNFontSet, fs,
1440 NULL); 1422 NULL);
1441 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1442 XNForeground, fg, XNBackground, bg,
1443 //XNFontSet, TermWin.fontset,
1444 NULL);
1445 } 1423 }
1446 1424
1447 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1425 Input_Context = XCreateIC (xim,
1426 XNInputStyle, input_style,
1448 XNClientWindow, TermWin.parent[0], 1427 XNClientWindow, TermWin.vt,
1449 XNFocusWindow, TermWin.parent[0], 1428 XNFocusWindow, TermWin.parent[0],
1450 preedit_attr ? XNPreeditAttributes : NULL, 1429 preedit_attr ? XNPreeditAttributes : NULL,
1451 preedit_attr, 1430 preedit_attr,
1452 status_attr ? XNStatusAttributes : NULL, 1431 status_attr ? XNStatusAttributes : NULL,
1453 status_attr, NULL); 1432 status_attr, NULL);
1433
1454 if (preedit_attr) XFree (preedit_attr); 1434 if (preedit_attr) XFree (preedit_attr);
1455 if (status_attr) XFree (status_attr); 1435 if (status_attr) XFree (status_attr);
1436 if (fs) XFreeFontSet (display->display, fs);
1456 1437
1457 if (Input_Context == NULL) 1438 if (Input_Context == NULL)
1458 { 1439 {
1459 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1460 display->put_xim (input_method); 1441 im_destroy ();
1461 return false; 1442 return false;
1462 } 1443 }
1463 1444
1464 if (input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)
1465 IMSetStatusPosition (); 1446 IMSetStatusPosition ();
1491 if (p && *p) 1472 if (p && *p)
1492 { 1473 {
1493 bool found = false; 1474 bool found = false;
1494 1475
1495 s = rxvt_splitcommastring (p); 1476 s = rxvt_splitcommastring (p);
1477
1496 for (i = 0; s[i]; i++) 1478 for (i = 0; s[i]; i++)
1497 { 1479 {
1498 if (*s[i]) 1480 if (*s[i])
1499 { 1481 {
1500 STRCPY (buf, "@im="); 1482 strcpy (buf, "@im=");
1501 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1483 strncat (buf, s[i], IMBUFSIZ - 5);
1502 if (IM_get_IC (buf)) 1484 if (IM_get_IC (buf))
1503 { 1485 {
1504 found = true; 1486 found = true;
1505 break; 1487 break;
1506 } 1488 }
1507 } 1489 }
1508 } 1490 }
1509 for (i = 0; s[i]; i++) 1491
1510 free (s[i]); 1492 rxvt_freecommastring (s);
1511 free (s);
1512 1493
1513 if (found) 1494 if (found)
1514 goto done; 1495 goto done;
1515 } 1496 }
1516 1497
1530} 1511}
1531 1512
1532void 1513void
1533rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetStatusPosition ()
1534{ 1515{
1535 XRectangle preedit_rect, status_rect, *needed_rect; 1516 XRectangle preedit_rect, status_rect, *needed_rect;
1536 XVaNestedList preedit_attr, status_attr; 1517 XVaNestedList preedit_attr, status_attr;
1537 1518
1538 if (Input_Context == NULL 1519 if (!Input_Context
1520 || !TermWin.focus
1539 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1521 || !(input_style & XIMPreeditArea)
1540 || !IMisRunning ()) 1522 || !IMisRunning ())
1541 return; 1523 return;
1542 1524
1543 /* Getting the necessary width of preedit area */ 1525 /* Getting the necessary width of preedit area */
1544 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1526 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1545 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1527 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1546 XFree (status_attr); 1528 XFree (status_attr);
1547 1529
1548 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);
1549 1532
1550 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1533 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1551 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1534 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1552 1535
1553 XSetICValues (Input_Context, 1536 XSetICValues (Input_Context,
1554 XNPreeditAttributes, preedit_attr, 1537 XNPreeditAttributes, preedit_attr,
1555 XNStatusAttributes, status_attr, NULL); 1538 XNStatusAttributes, status_attr, NULL);
1556 1539
1557 XFree (preedit_attr); 1540 XFree (preedit_attr);
1558 XFree (status_attr); 1541 XFree (status_attr);
1559} 1542}
1560#endif /* USE_XIM */ 1543#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines