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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines