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.183 by root, Tue Jan 17 10:19:13 2006 UTC vs.
Revision 1.230 by root, Sun Aug 27 10:10:25 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
73 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 67 return false;
75 68
76 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
78 return true; 71 return true;
79} 72}
80 73
81void 74void
82rxvt_push_locale (const char *locale) 75rxvt_push_locale (const char *locale) NOTHROW
83{ 76{
84 strcpy (savelocale, curlocale); 77 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 78 rxvt_set_locale (locale);
86} 79}
87 80
88void 81void
89rxvt_pop_locale () 82rxvt_pop_locale () NOTHROW
90{ 83{
91 rxvt_set_locale (savelocale); 84 rxvt_set_locale (savelocale);
92} 85}
93 86
94#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
155} 148}
156#endif 149#endif
157 150
158rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
159 : 152 :
160#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 155#endif
163#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 158#endif
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 176#endif
184#ifdef USE_XIM 177#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
186#endif 179#endif
180#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb),
182#endif
187 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
… …
196 193
197 termlist.push_back (this); 194 termlist.push_back (this);
198 195
199#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 198#endif
205} 199}
206 200
207// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 202// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
210{ 204{
211 if (cmd_pid) 205 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
213 207
214#ifdef UTMP_SUPPORT 208 pty_ev.stop ();
215 privileged_utmp (RESTORE); 209 delete pty; pty = 0;
216#endif
217
218 pty.put ();
219} 210}
220 211
221rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
222{ 213{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 215
227 emergency_cleanup (); 216 emergency_cleanup ();
228 217
229#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
233#endif 222#endif
234 delete fontset[0]; 223 delete fontset[0];
235 224
236 if (display) 225 if (display)
237 { 226 {
238 dDisp;
239
240 selection_clear (); 227 selection_clear ();
241 228
242#ifdef USE_XIM 229#ifdef USE_XIM
243 im_destroy (); 230 im_destroy ();
244#endif 231#endif
245#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 235#endif
249#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 238#endif
252#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 250#endif
264#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 255#endif
269 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
270 257
271 delete drawable; 258 delete drawable;
272 // destroy all windows 259 // destroy all windows
273 if (parent[0]) 260 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
275 }
276 262
277 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
279#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
281#endif 278#endif
282 279
283 displays.put (display); 280 displays.put (display);
284 281
285 scr_release (); 282 scr_release ();
… …
288 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 286 free (allocated [i]);
290 287
291 free (selection.text); 288 free (selection.text);
292 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 290 free (env_display);
295 free (env_term); 291 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 292 free (locale);
298 free (v_buffer); 293 free (v_buffer);
299 free (incr_buf); 294 free (incr_buf);
300 295
301 delete envv; 296 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
305 delete keyboard; 300 delete keyboard;
306#endif 301#endif
307} 302}
308 303
304// child has exited, usually destroys
309void 305void
310rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
311{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
312 cmd_pid = 0; 310 cmd_pid = 0;
313 311
314 if (!OPTION (Opt_hold)) 312 if (!OPTION (Opt_hold))
315 destroy (); 313 destroy ();
316} 314}
… …
319rxvt_term::destroy () 317rxvt_term::destroy ()
320{ 318{
321 if (destroy_ev.active) 319 if (destroy_ev.active)
322 return; 320 return;
323 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
324#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
325 scr_overlay_off (); 325 scr_overlay_off ();
326#endif 326#endif
327 327
328 if (display) 328 if (display)
… …
331 im_ev.stop (display); 331 im_ev.stop (display);
332#endif 332#endif
333#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
335#endif 335#endif
336#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
337 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif 338#endif
339 incr_ev.stop (); 339 incr_ev.stop ();
340 termwin_ev.stop (display); 340 termwin_ev.stop (display);
341 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
382{ 382{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
385} 385}
386 386
387#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
388static void 388static void
389print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
390{ 390{
391 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
441 else 441 else
442 { 442 {
443 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 444 // so just output the error and continue
445#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
446 print_x_error (display, event); 448 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 449#endif
450 } 450 }
451 451
452 return 0; 452 return 0;
453} 453}
… …
461 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
462} 462}
463 463
464/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
465bool 465bool
466rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 467{
468 this->envv = envv;
469
468 SET_R (this); 470 SET_R (this);
469 set_locale (""); 471 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 472 set_environ (envv); // few things in X do not call setlocale :(
471 473
472 if (!init_vars ()) 474 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 488#endif
487 489
488#if ENABLE_PERL 490 pty = ptytty::create ();
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513 491
514 create_windows (argc, argv); 492 create_windows (argc, argv);
515 493
516 dDisp;
517
518 init_xlocale (); 494 init_xlocale ();
519 495
520 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
521 497
522#if 0 498#if 0
523 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
524#endif 500#endif
525 501
526#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
527 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
528 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
529#endif 505#endif
530#ifdef TRANSPARENT 506#ifdef TRANSPARENT
531 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
532 { 508 {
533 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
534 check_our_parents (); 510 check_our_parents ();
535 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
536 } 512 }
537#endif 513#endif
538 514#if ENABLE_PERL
539 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
540 XMapWindow (disp, parent[0]); 516#endif
541 517
542 set_colorfgbg (); 518 set_colorfgbg ();
543 519
544 init_command (cmd_argv); 520 init_command (cmd_argv);
545 521
546 free (cmd_argv); 522 free (cmd_argv);
547 523
548 if (pty.pty >= 0) 524 if (pty->pty >= 0)
549 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
550 526
551 check_ev.start (); 527 check_ev.start ();
552 528
553 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
554 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
555 return true; 544 return true;
556} 545}
557 546
558static struct sig_handlers 547static struct sig_handlers
559{ 548{
560 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
561 550
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /* 551 /*
577 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
578 */ 553 */
579 void 554 void
580 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
581 { 556 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
588 } 560 }
589 561
590 sig_handlers () 562 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
594 { 565 {
595 } 566 }
596} sig_handlers; 567} sig_handlers;
597 568
598char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
599 570
600void 571void
601rxvt_init () 572rxvt_init ()
602{ 573{
574 ptytty::init ();
575
603 rxvt_environ = environ; 576 rxvt_environ = environ;
604
605 /*
606 * Save and then give up any super-user privileges
607 * If we need privileges in any area then we must specifically request it.
608 * We should only need to be root in these cases:
609 * 1. write utmp entries on some systems
610 * 2. chown tty on some systems
611 */
612 rxvt_privileges (SAVE);
613 rxvt_privileges (IGNORE);
614 577
615 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
617 580
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
621 583
622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
623 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
… …
652 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
653 615
654 return p; 616 return p;
655} 617}
656 618
657void * 619void *
658rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
659{ 621{
660 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
661 623
662 if (!p) 624 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
664 626
665 return p; 627 return p;
666} 628}
667
668/* ------------------------------------------------------------------------- *
669 * PRIVILEGED OPERATIONS *
670 * ------------------------------------------------------------------------- */
671/* take care of suid/sgid super-user (root) privileges */
672void
673rxvt_privileges (rxvt_privaction action)
674{
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 setegid (getgid ());
691 seteuid (getuid ());
692 break;
693 case SAVE:
694 saved_egid = getegid ();
695 saved_euid = geteuid ();
696 break;
697 case RESTORE:
698 setegid (saved_egid);
699 seteuid (saved_euid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setgid (getgid ());
707 setuid (getuid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit))
723 return;
724
725 rxvt_privileges (RESTORE);
726
727 if (action == SAVE)
728 pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
729 else
730 pty.logout ();
731
732 rxvt_privileges (IGNORE);
733}
734#endif
735 629
736/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
737/* 631/*
738 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
739 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
… …
743{ 637{
744 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
745 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
746 unsigned int w, h; 640 unsigned int w, h;
747 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
748 dDisp;
749
750 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
751 ncol, nrow, szHint.width, szHint.height));
752 642
753 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
754 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
755 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
756 646
… …
818 708
819 if (scrollBar.state) 709 if (scrollBar.state)
820 { 710 {
821 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
822 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
823 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
824 window_vt_x += sb_w; 715 window_vt_x += sb_w;
825 } 716 }
826 717
827 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
828 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
829 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
830 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
831 722
832 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
833 { 724 {
834 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
853 744
854 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
855 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
856 747
857 if (recalc_x) 748 if (recalc_x)
858 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
859 if (recalc_y) 751 if (recalc_y)
860 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
861 753
862 ncol = width / fwidth; 754 ncol = width / fwidth;
863 nrow = height / fheight; 755 nrow = height / fheight;
864 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
865 ncol, nrow, szHint.width,
866 szHint.height));
867 return;
868} 756}
869 757
870/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
871/* 759/*
872 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
873 * Called after a window size change. 761 * Called after a window size change.
874 */ 762 */
875void 763void
876rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
877{ 765{
878 if (pty.pty < 0) 766 if (pty->pty < 0)
879 return; 767 return;
880 768
881 struct winsize ws; 769 struct winsize ws;
882 770
883 ws.ws_col = ncol; 771 ws.ws_col = ncol;
884 ws.ws_row = nrow; 772 ws.ws_row = nrow;
885 ws.ws_xpixel = width; 773 ws.ws_xpixel = width;
886 ws.ws_ypixel = height; 774 ws.ws_ypixel = height;
887 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
888 776
889#if 0 777#if 0
890 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
891 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
892 kill (-cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
… …
924 delete fontset[0]; 812 delete fontset[0];
925 fontset[0] = fs; 813 fontset[0] = fs;
926 814
927 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
928 prop.height += lineSpace; 816 prop.height += lineSpace;
817
929 fs->set_prop (prop); 818 fs->set_prop (prop, false);
930 819
931 fwidth = prop.width; 820 fwidth = prop.width;
932 fheight = prop.height; 821 fheight = prop.height;
933 fbase = prop.ascent; 822 fbase = prop.ascent;
934 823
… …
953 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 842 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
954 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 843 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
955 } 844 }
956 845
957 fs->populate (res); 846 fs->populate (res);
958 fs->set_prop (prop2); 847 fs->set_prop (prop2, true);
959 } 848 }
960#else 849#else
961 fontset[style] = fontset[0]; 850 fontset[style] = fontset[0];
962#endif 851#endif
963 } 852 }
… …
972 return true; 861 return true;
973} 862}
974 863
975void rxvt_term::set_string_property (Atom prop, const char *str, int len) 864void rxvt_term::set_string_property (Atom prop, const char *str, int len)
976{ 865{
977 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
978 prop, XA_STRING, 8, PropModeReplace, 867 prop, XA_STRING, 8, PropModeReplace,
979 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 868 (const unsigned char *)str, len >= 0 ? len : strlen (str));
980} 869}
981 870
982void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 871void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
983{ 872{
984 wchar_t *ws = rxvt_mbstowcs (str, len); 873 wchar_t *ws = rxvt_mbstowcs (str, len);
985 char *s = rxvt_wcstoutf8 (ws); 874 char *s = rxvt_wcstoutf8 (ws);
986 875
987 XChangeProperty (display->display, parent[0], 876 XChangeProperty (dpy, parent[0],
988 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 877 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
989 (const unsigned char *)s, strlen (s)); 878 (const unsigned char *)s, strlen (s));
990 879
991 free (s); 880 free (s);
992 free (ws); 881 free (ws);
… …
1017void 906void
1018rxvt_term::set_window_color (int idx, const char *color) 907rxvt_term::set_window_color (int idx, const char *color)
1019{ 908{
1020 rxvt_color xcol; 909 rxvt_color xcol;
1021 int i; 910 int i;
1022 911
1023 if (color == NULL || *color == '\0') 912 if (color == NULL || *color == '\0')
1024 return; 913 return;
914
915 color = strdup (color);
916 allocated.push_back ((void *)color);
917 rs[Rs_color + idx] = color;
1025 918
1026 /* handle color aliases */ 919 /* handle color aliases */
1027 if (isdigit (*color)) 920 if (isdigit (*color))
1028 { 921 {
1029 i = atoi (color); 922 i = atoi (color);
1030 923
1031 if (i >= 8 && i <= 15) 924 if (i >= 8 && i <= 15)
1032 { /* bright colors */ 925 { /* bright colors */
1033 i -= 8; 926 i -= 8;
1034 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 927 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1035 SET_PIXCOLOR (idx);
1036 goto done; 928 goto done;
1037 } 929 }
1038 930
1039 if (i >= 0 && i <= 7) 931 if (i >= 0 && i <= 7)
1040 { /* normal colors */ 932 { /* normal colors */
1041 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1042 SET_PIXCOLOR (idx);
1043 goto done; 934 goto done;
1044 } 935 }
1045 } 936 }
1046 937
1047 if (!rXParseAllocColor (&xcol, color)) 938 set_color (xcol, color);
1048 return;
1049
1050 /* XStoreColor (display->display, display->cmap, XColor*); */
1051 939
1052 /* 940 /*
1053 * FIXME: should free colors here, but no idea how to do it so instead, 941 * FIXME: should free colors here, but no idea how to do it so instead,
1054 * so just keep gobbling up the colormap 942 * so just keep gobbling up the colormap
1055 */ 943 */
1056# if 0
1057 for (i = Color_Black; i <= Color_White; i++)
1058 if (pix_colors[idx] == pix_colors[i])
1059 break;
1060 if (i > Color_White)
1061 {
1062 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1063 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1064 DisplayPlanes (display->display, display->screen));
1065 }
1066# endif
1067 944
1068 pix_colors_focused[idx] = xcol; 945 pix_colors_focused[idx] = xcol;
1069 SET_PIXCOLOR (idx);
1070 946
1071 /* XSetWindowAttributes attr; */ 947 /* XSetWindowAttributes attr; */
1072 /* Cursor cursor; */ 948 /* Cursor cursor; */
1073done: 949done:
1074
1075#if OFF_FOCUS_FADING
1076 if (rs[Rs_fade])
1077 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1078#endif
1079
1080 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1081 951
952 update_fade_color (idx);
1082 recolour_cursor (); 953 recolour_cursor ();
1083 scr_recolour (); 954 scr_recolour ();
1084} 955}
1085 956
1086#else 957#else
… …
1088#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1089 960
1090void 961void
1091rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1092{ 963{
1093 XColor xcol[2]; 964 XColor fg, bg;
1094 965
1095 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1096 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1097 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1098 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1099 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1100 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1101 973
1102 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1103 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1104} 975}
1105 976
1106/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1107/* 978/*
1108 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1112{ 983{
1113 unsigned int i; 984 unsigned int i;
1114 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1115 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1116 987
1117 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1118 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1119 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1120 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1121 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1122 { 992 {
… …
1137 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1138} 1008}
1139 1009
1140/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1141 1011
1142int 1012bool
1143rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1144{ 1014{
1145 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1146 {
1147 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1148 return false;
1149 }
1150
1151 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1152} 1026}
1153 1027
1154/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1155 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1156 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1157void 1031void
1158rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1159{ 1033{
1160 int fix_screen; 1034 int fix_screen;
1161 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1162 dDisp; 1036 int old_height = szHint.height;
1163 1037
1164 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1165 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1166 1042
1167 if (!ignoreparent) 1043 if (!ignoreparent)
1168 { 1044 {
1169#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1170 /* 1046 /*
… …
1174 int x, y, x1, y1; 1050 int x, y, x1, y1;
1175 int dx, dy; 1051 int dx, dy;
1176 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1177 Window unused_cr; 1053 Window unused_cr;
1178 1054
1179 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1180 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1181 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1182 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1183 /* 1059 /*
1184 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1185 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1186 */ 1062 */
… …
1188 { 1064 {
1189 x -= x1; 1065 x -= x1;
1190 y -= y1; 1066 y -= y1;
1191 } 1067 }
1192 1068
1193 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1194 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1195 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1196 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1197 1073
1198 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1199 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1200 dx = 0; 1076 dx = 0;
… …
1203 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1204 dy = 0; 1080 dy = 0;
1205 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1206 dy /= 2; 1082 dy /= 2;
1207 1083
1208 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1209 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1210#else 1086#else
1211 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1212#endif 1088#endif
1213 } 1089 }
1214 1090
1215 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1216 1092
1217 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1218 { 1094 {
1219 if (scrollBar.state) 1095 if (scrollBar.state)
1220 { 1096 {
1221 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1222 window_sb_x, 0, 1098 window_sb_x, 0,
1223 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1224 resize_scrollbar (); 1100 resize_scrollbar ();
1225 } 1101 }
1226 1102
1227 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1228 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1229 width, height); 1105 width, height);
1230 1106
1231 scr_clear (); 1107 scr_clear ();
1232#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1109 resize_pixmap ();
1234#endif 1110#endif
1235 } 1111 }
1236 1112
1237 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1238 {
1239 int curr_screen = -1;
1240 int old_ncol = prev_ncol;
1241
1242 /* scr_reset only works on the primary screen */
1243 if (old_height) /* this is not the first time through */
1244 {
1245 unsigned int ocol = ncol;
1246 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1247 curr_screen = scr_change_screen (PRIMARY);
1248 ncol = ocol;
1249 }
1250
1251 scr_reset (); 1114 scr_reset ();
1252 1115
1253 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1254 { 1117 //scr_touch (false);
1255 scr_change_screen (curr_screen);
1256 selection_check (old_ncol != ncol ? 4 : 0);
1257 }
1258 }
1259
1260 old_width = szHint.width;
1261 old_height = szHint.height;
1262 1118
1263#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1264 if (pixmap) 1120 if (pixmap)
1265 scr_touch (false); 1121 scr_touch (false);
1266#endif 1122#endif
1267 1123
1268#ifdef USE_XIM 1124#ifdef USE_XIM
1269 IMSetStatusPosition (); 1125 IMSetPosition ();
1270#endif 1126#endif
1271} 1127}
1272 1128
1273/* 1129/*
1274 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1279{ 1135{
1280 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1281 1137
1282 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1283 { 1139 {
1284 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1285 1141
1286 if (newwidth == 0) 1142 if (newwidth == 0)
1287 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1288 if (newheight == 0) 1144 if (newheight == 0)
1289 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1303#ifdef USE_XIM 1159#ifdef USE_XIM
1304 1160
1305void 1161void
1306rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1307{ 1163{
1308 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1309 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1310} 1166}
1311 1167
1312void 1168void
1313rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1314{ 1170{
… …
1351 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1352 1208
1353 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1354 *p = '\0'; 1210 *p = '\0';
1355 1211
1356 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1357 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1358 1214
1359 if (win != None) 1215 if (win != None)
1360 return True; 1216 return True;
1361 } 1217 }
1362 1218
… …
1369 XPoint nspot; 1225 XPoint nspot;
1370 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1371 1227
1372 if (!Input_Context 1228 if (!Input_Context
1373 || !focus 1229 || !focus
1374 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1375 return; 1231 return;
1376 1232
1377 im_set_position (nspot); 1233 im_set_position (nspot);
1378 1234
1379 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1398 input_method = 0; 1254 input_method = 0;
1399 } 1255 }
1400 1256
1401 Input_Context = 0; 1257 Input_Context = 0;
1402} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1403 1333
1404/* 1334/*
1405 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1406 * open a suitable preedit type 1336 * open a suitable preedit type
1407 */ 1337 */
… …
1414 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1345 unsigned long fg, bg;
1416 const char *p; 1346 const char *p;
1417 char **s; 1347 char **s;
1418 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1419 1352
1420 set_environ (envv); 1353 set_environ (envv);
1421 1354
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1356 return false;
1424 1357
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1427 if (input_method == NULL) 1359 if (input_method == NULL)
1428 return false; 1360 return false;
1429 1361
1430 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1450 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1451 1383
1452 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1453 { 1385 {
1454 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1455 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1456 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1457 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1458 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1459 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1461 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 1400
1463 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1464 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1465 { 1403 {
1466 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1504 "*", 1442 "*",
1505 fheight, 1443 fheight,
1506 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1507 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1508 1446
1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1510 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1511 1449
1512 if (missing_charset_list) 1450 if (missing_charset_list)
1513 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1514 1452
… …
1555 XNBackground, bg, 1493 XNBackground, bg,
1556 XNArea, &status_rect, 1494 XNArea, &status_rect,
1557 XNFontSet, fs, 1495 XNFontSet, fs,
1558 NULL); 1496 NULL);
1559 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1560 1521
1561 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1562 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1563 XNClientWindow, vt, 1524 XNClientWindow, vt,
1564 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1566 preedit_attr, 1527 preedit_attr,
1567 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1568 status_attr, NULL); 1529 status_attr, NULL);
1569 1530
1570 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1571 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1572 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1573 1534
1574 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1575 { 1536 {
1576 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577 im_destroy (); 1538 im_destroy ();
1578 return false; 1539 return false;
1579 } 1540 }
1580 1541
1581 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1582 IMSetStatusPosition (); 1548 IMSetPosition ();
1583 1549
1584 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585 return true; 1550 return true;
1586} 1551}
1587 1552
1588void 1553void
1589rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1595 1560
1596 make_current (); 1561 make_current ();
1597 1562
1598 im_destroy (); 1563 im_destroy ();
1599 1564
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1565 if (Input_Context)
1602 return; 1566 return;
1603 1567
1604#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1605 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1647 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1648#endif 1612#endif
1649} 1613}
1650 1614
1651void 1615void
1652rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1653{ 1617{
1654 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1655 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1656 1620
1657 if (!Input_Context 1621 if (!Input_Context
1658 || !focus 1622 || !focus
1659 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1660 || !IMisRunning ()) 1624 || !IMisRunning ())
1661 return; 1625 return;
1662 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1663 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1664 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1665 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1666 XFree (status_attr); 1640 XFree (status_attr);
1667 1641
1668 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1669 XFree (needed_rect); 1643 XFree (needed_rect);
1670 1644
1671 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1672 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1673 1647
1674 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1675 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1676 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1677 1652
1653 XFree (status_attr);
1654 }
1655
1678 XFree (preedit_attr); 1656 XFree (preedit_attr);
1679 XFree (status_attr);
1680} 1657}
1681#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1682 1659
1683/*----------------------------------------------------------------------*/
1684rxvt_t rxvt_current_term;
1685
1686/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines