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

Diff Legend

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