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.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC

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{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 150#endif
163#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 153#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 156#endif
172#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
185 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
186#endif 171#endif
187#ifdef USE_XIM 172#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
189#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
190 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
199 188
200 termlist.push_back (this); 189 termlist.push_back (this);
201 190
202#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
203 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
204
205 if (!keyboard)
206 rxvt_fatal ("out of memory, aborting.\n");
207#endif 193#endif
208} 194}
209 195
210// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
211// for use before an emergency exit 197// for use before an emergency exit
212void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
213{ 199{
214 if (cmd_pid) 200 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
216 202
217#ifdef UTMP_SUPPORT 203 pty_ev.stop ();
218 privileged_utmp (RESTORE); 204 delete pty; pty = 0;
219#endif
220
221 pty.put ();
222} 205}
223 206
224rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
225{ 208{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
229 210
230 emergency_cleanup (); 211 emergency_cleanup ();
231 212
232#if ENABLE_STYLES 213#if ENABLE_STYLES
236#endif 217#endif
237 delete fontset[0]; 218 delete fontset[0];
238 219
239 if (display) 220 if (display)
240 { 221 {
241 dDisp;
242
243 selection_clear (); 222 selection_clear ();
244 223
245#ifdef USE_XIM 224#ifdef USE_XIM
246 im_destroy (); 225 im_destroy ();
247#endif 226#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif
251#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
254#endif 230#endif
255#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
256 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
257#endif 233#endif
258#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
259 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
260 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
261 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
262 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
263 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
264 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
265 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
269#endif 245#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
274#endif 250#endif
275 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
276 252
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 253 delete drawable;
283 // destroy all windows 254 // destroy all windows
284 if (parent[0]) 255 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
286 }
287 257
288 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
289 delete pix_colors_focused; 270 delete pix_colors_focused;
290#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
291 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
292#endif 273#endif
293 274
299 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
300 free (allocated [i]); 281 free (allocated [i]);
301 282
302 free (selection.text); 283 free (selection.text);
303 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
304 free (env_windowid);
305 free (env_display); 285 free (env_display);
306 free (env_term); 286 free (env_term);
307 free (env_colorfgbg);
308 free (locale); 287 free (locale);
309 free (v_buffer); 288 free (v_buffer);
310 free (incr_buf); 289 free (incr_buf);
311 290
312 delete envv; 291 delete envv;
315#ifdef KEYSYM_RESOURCE 294#ifdef KEYSYM_RESOURCE
316 delete keyboard; 295 delete keyboard;
317#endif 296#endif
318} 297}
319 298
299// child has exited, usually destroys
320void 300void
321rxvt_term::child_exit () 301rxvt_term::child_cb (child_watcher &w, int status)
322{ 302{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304
323 cmd_pid = 0; 305 cmd_pid = 0;
324 306
325 if (!OPTION (Opt_hold)) 307 if (!OPTION (Opt_hold))
326 destroy (); 308 destroy ();
327} 309}
330rxvt_term::destroy () 312rxvt_term::destroy ()
331{ 313{
332 if (destroy_ev.active) 314 if (destroy_ev.active)
333 return; 315 return;
334 316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318
335#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
336 scr_overlay_off (); 320 scr_overlay_off ();
337#endif 321#endif
338 322
339 if (display) 323 if (display)
341#if USE_XIM 325#if USE_XIM
342 im_ev.stop (display); 326 im_ev.stop (display);
343#endif 327#endif
344#if HAVE_SCROLLBARS 328#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 330#endif
350#if TRANSPARENT 331#if TRANSPARENT
351 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
352#endif 333#endif
353 incr_ev.stop (); 334 incr_ev.stop ();
396{ 377{
397 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
398 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
399} 380}
400 381
401#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
402static void 383static void
403print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
404{ 385{
405 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
406 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
454 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
455 else 436 else
456 { 437 {
457 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
458 // so just output the error and continue 439 // so just output the error and continue
459#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
460 print_x_error (display, event); 443 print_x_error (display, event);
461#else
462 old_xerror_handler (display, event);
463#endif 444#endif
464 } 445 }
465 446
466 return 0; 447 return 0;
467} 448}
475 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
476} 457}
477 458
478/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
479bool 460bool
480rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
481{ 462{
463 this->envv = envv;
464
482 SET_R (this); 465 SET_R (this);
483 set_locale (""); 466 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :( 467 set_environ (envv); // few things in X do not call setlocale :(
485 468
486 if (!init_vars ()) 469 if (!init_vars ())
492 475
493#ifdef KEYSYM_RESOURCE 476#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 477 keyboard->register_done ();
495#endif 478#endif
496 479
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 481 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 483#endif
504 484
505#if ENABLE_PERL 485 pty = ptytty::create ();
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
531 486
532 create_windows (argc, argv); 487 create_windows (argc, argv);
533 488
534 dDisp;
535
536 init_xlocale (); 489 init_xlocale ();
537 490
538 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
539 492
540#if 0 493#if 0
541 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
542#endif 495#endif
543 496
544#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
547#endif 500#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif
552#ifdef TRANSPARENT 501#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
554 { 503 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
556 check_our_parents (); 505 check_our_parents ();
557 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
558 } 507 }
559#endif 508#endif
560 509
561 XMapWindow (disp, vt);
562 XMapWindow (disp, parent[0]);
563
564 set_colorfgbg (); 510 set_colorfgbg ();
565 511
566 init_command (cmd_argv); 512 init_command (cmd_argv);
567 513
568 free (cmd_argv); 514 free (cmd_argv);
569 515
570 if (pty.pty >= 0) 516 if (pty->pty >= 0)
571 pty_ev.start (pty.pty, EVENT_READ); 517 pty_ev.start (pty->pty, EVENT_READ);
572 518
573 check_ev.start (); 519 check_ev.start ();
574 520
575 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
576 522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
535
577 return true; 536 return true;
578} 537}
579 538
580static struct sig_handlers 539static struct sig_handlers
581{ 540{
582 sig_watcher sw_chld, sw_term, sw_int; 541 sig_watcher sw_term, sw_int;
583 542
584 void sig_chld (sig_watcher &w)
585 {
586 // we are being called for every SIGCHLD, find the corresponding term
587 int pid;
588
589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591 if (pid == (*t)->cmd_pid)
592 {
593 (*t)->child_exit ();
594 break;
595 }
596 }
597
598 /* 543 /*
599 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
600 */ 545 */
601 void 546 void
602 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
603 { 548 {
604#ifdef DEBUG_CMD
605 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
606#endif
607 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
608 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
609 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
610 } 552 }
611 553
612 sig_handlers () 554 sig_handlers ()
613 : sw_chld (this, &sig_handlers::sig_chld),
614 sw_term (this, &sig_handlers::sig_term), 555 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 556 sw_int (this, &sig_handlers::sig_term)
616 { 557 {
617 } 558 }
618} sig_handlers; 559} sig_handlers;
619 560
620char **rxvt_environ; // startup environment 561char **rxvt_environ; // startup environment
621 562
622void 563void
623rxvt_init () 564rxvt_init ()
624{ 565{
566 ptytty::init ();
567
625 rxvt_environ = environ; 568 rxvt_environ = environ;
626
627 /*
628 * Save and then give up any super-user privileges
629 * If we need privileges in any area then we must specifically request it.
630 * We should only need to be root in these cases:
631 * 1. write utmp entries on some systems
632 * 2. chown tty on some systems
633 */
634 rxvt_privileges (SAVE);
635 rxvt_privileges (IGNORE);
636 569
637 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
638 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
639 572
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT);
643 575
644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
645 /* signal (SIGURG, SIG_DFL); */ 577 /* signal (SIGURG, SIG_DFL); */
674 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
675 607
676 return p; 608 return p;
677} 609}
678 610
679void * 611void *
680rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
681{ 613{
682 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
683 615
684 if (!p) 616 if (!p)
685 rxvt_fatal ("memory allocation failure. aborting.\n"); 617 rxvt_fatal ("memory allocation failure. aborting.\n");
686 618
687 return p; 619 return p;
688} 620}
689
690/* ------------------------------------------------------------------------- *
691 * PRIVILEGED OPERATIONS *
692 * ------------------------------------------------------------------------- */
693/* take care of suid/sgid super-user (root) privileges */
694void
695rxvt_privileges (rxvt_privaction action)
696{
697#if ! defined(__CYGWIN32__)
698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
699 /* setreuid () is the poor man's setuid (), seteuid () */
700# define seteuid(a) setreuid(-1, (a))
701# define setegid(a) setregid(-1, (a))
702# define HAVE_SETEUID
703# endif
704# ifdef HAVE_SETEUID
705 switch (action)
706 {
707 case IGNORE:
708 /*
709 * change effective uid/gid - not real uid/gid - so we can switch
710 * back to root later, as required
711 */
712 setegid (getgid ());
713 seteuid (getuid ());
714 break;
715 case SAVE:
716 saved_egid = getegid ();
717 saved_euid = geteuid ();
718 break;
719 case RESTORE:
720 setegid (saved_egid);
721 seteuid (saved_euid);
722 break;
723 }
724# else
725 switch (action)
726 {
727 case IGNORE:
728 setgid (getgid ());
729 setuid (getuid ());
730 /* FALLTHROUGH */
731 case SAVE:
732 /* FALLTHROUGH */
733 case RESTORE:
734 break;
735 }
736# endif
737#endif
738}
739
740#ifdef UTMP_SUPPORT
741void
742rxvt_term::privileged_utmp (rxvt_privaction action)
743{
744 if (OPTION (Opt_utmpInhibit)
745 || !pty.name || !*pty.name)
746 return;
747
748 rxvt_privileges (RESTORE);
749
750 if (action == SAVE)
751 makeutent (pty.name, rs[Rs_display_name]);
752 else
753 cleanutent ();
754
755 rxvt_privileges (IGNORE);
756}
757#endif
758 621
759/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
760/* 623/*
761 * window size/position calculcations for XSizeHint and other storage. 624 * window size/position calculcations for XSizeHint and other storage.
762 * if width/height are non-zero then override calculated width/height 625 * if width/height are non-zero then override calculated width/height
763 */ 626 */
764void 627void
765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766{ 629{
767 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
768 int x, y, sb_w, mb_h, flags; 631 int x, y, sb_w, flags;
769 unsigned int w, h; 632 unsigned int w, h;
770 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
771 dDisp;
772
773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
774 ncol, nrow, szHint.width, szHint.height));
775 634
776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
777 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
779 638
834 max_width = MAX_COLS * fwidth; 693 max_width = MAX_COLS * fwidth;
835 max_height = MAX_ROWS * fheight; 694 max_height = MAX_ROWS * fheight;
836 695
837 szHint.base_width = szHint.base_height = 2 * int_bwidth; 696 szHint.base_width = szHint.base_height = 2 * int_bwidth;
838 697
839 sb_w = mb_h = 0; 698 sb_w = 0;
840 window_vt_x = window_vt_y = int_bwidth; 699 window_vt_x = window_vt_y = int_bwidth;
841 700
842 if (scrollbar_visible ()) 701 if (scrollBar.state)
843 { 702 {
844 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
845 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
846 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
847 window_vt_x += sb_w; 707 window_vt_x += sb_w;
848 } 708 }
849 709
850 if (menubar_visible ())
851 {
852 mb_h = menuBar_TotalHeight ();
853 szHint.base_height += mb_h;
854 window_vt_y += mb_h;
855 }
856
857 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
858 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
859 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
860 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
861 714
862 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
863 { 716 {
864 szHint.width = newwidth; 717 szHint.width = newwidth;
879 { 732 {
880 min_it (height, max_height); 733 min_it (height, max_height);
881 szHint.height = szHint.base_height + height; 734 szHint.height = szHint.base_height + height;
882 } 735 }
883 736
884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
885 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
886 739
887 if (recalc_x) 740 if (recalc_x)
888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
889 if (recalc_y) 743 if (recalc_y)
890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
891 745
892 ncol = width / fwidth; 746 ncol = width / fwidth;
893 nrow = height / fheight; 747 nrow = height / fheight;
894 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
895 ncol, nrow, szHint.width,
896 szHint.height));
897 return;
898} 748}
899 749
900/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
901/* 751/*
902 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
903 * Called after a window size change. 753 * Called after a window size change.
904 */ 754 */
905void 755void
906rxvt_term::tt_winch () 756rxvt_term::tt_winch ()
907{ 757{
908 if (pty.pty < 0) 758 if (pty->pty < 0)
909 return; 759 return;
910 760
911 struct winsize ws; 761 struct winsize ws;
912 762
913 ws.ws_col = ncol; 763 ws.ws_col = ncol;
914 ws.ws_row = nrow; 764 ws.ws_row = nrow;
915 ws.ws_xpixel = width; 765 ws.ws_xpixel = width;
916 ws.ws_ypixel = height; 766 ws.ws_ypixel = height;
917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
918 768
919#if 0 769#if 0
920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
921 if (cmd_pid) /* force through to the command */ 771 if (cmd_pid) /* force through to the command */
922 kill (-cmd_pid, SIGWINCH); 772 kill (-cmd_pid, SIGWINCH);
1002 return true; 852 return true;
1003} 853}
1004 854
1005void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
1006{ 856{
1007 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
1008 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
1009 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1010} 860}
1011 861
1012void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1013{ 863{
1014 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
1015 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
1016 866
1017 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1019 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
1020 870
1021 free (s); 871 free (s);
1022 free (ws); 872 free (ws);
1047void 897void
1048rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
1049{ 899{
1050 rxvt_color xcol; 900 rxvt_color xcol;
1051 int i; 901 int i;
1052 902
1053 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
1054 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
1055 909
1056 /* handle color aliases */ 910 /* handle color aliases */
1057 if (isdigit (*color)) 911 if (isdigit (*color))
1058 { 912 {
1059 i = atoi (color); 913 i = atoi (color);
1060 914
1061 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
1062 { /* bright colors */ 916 { /* bright colors */
1063 i -= 8; 917 i -= 8;
1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1065 SET_PIXCOLOR (idx);
1066 goto done; 919 goto done;
1067 } 920 }
1068 921
1069 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
1070 { /* normal colors */ 923 { /* normal colors */
1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1072 SET_PIXCOLOR (idx);
1073 goto done; 925 goto done;
1074 } 926 }
1075 } 927 }
1076 928
1077 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
1078 return;
1079
1080 /* XStoreColor (display->display, display->cmap, XColor*); */
1081 930
1082 /* 931 /*
1083 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
1084 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
1085 */ 934 */
1086# if 0
1087 for (i = Color_Black; i <= Color_White; i++)
1088 if (pix_colors[idx] == pix_colors[i])
1089 break;
1090 if (i > Color_White)
1091 {
1092 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1093 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1094 DisplayPlanes (display->display, display->screen));
1095 }
1096# endif
1097 935
1098 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
1099 SET_PIXCOLOR (idx);
1100 937
1101 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
1102 /* Cursor cursor; */ 939 /* Cursor cursor; */
1103done: 940done:
1104 941
1105#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
1106 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
1107 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
1108#endif 949#endif
1109 950
1110 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
1111 952
1112 recolour_cursor (); 953 recolour_cursor ();
1118#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1119 960
1120void 961void
1121rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1122{ 963{
1123 XColor xcol[2]; 964 XColor fg, bg;
1124 965
1125 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1126 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1127 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1128 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1129 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1130 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1131 973
1132 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1133 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1134} 975}
1135 976
1136/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1137/* 978/*
1138 * 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
1142{ 983{
1143 unsigned int i; 984 unsigned int i;
1144 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1145 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1146 987
1147 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1148 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1149 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1150 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1151 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1152 { 992 {
1167 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1168} 1008}
1169 1009
1170/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1171 1011
1172int 1012bool
1173rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1174{ 1014{
1175 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1176 {
1177 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1178 return false;
1179 }
1180
1181 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]);
1182} 1026}
1183 1027
1184/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1185 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1186 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1187void 1031void
1188rxvt_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)
1189{ 1033{
1190 int fix_screen; 1034 int fix_screen;
1191 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1192 dDisp; 1036 int old_height = szHint.height;
1193 1037
1194 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)))
1195 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1196 1042
1197 if (!ignoreparent) 1043 if (!ignoreparent)
1198 { 1044 {
1199#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1200 /* 1046 /*
1204 int x, y, x1, y1; 1050 int x, y, x1, y1;
1205 int dx, dy; 1051 int dx, dy;
1206 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1207 Window unused_cr; 1053 Window unused_cr;
1208 1054
1209 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1210 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1211 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1212 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1213 /* 1059 /*
1214 * 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
1215 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1216 */ 1062 */
1218 { 1064 {
1219 x -= x1; 1065 x -= x1;
1220 y -= y1; 1066 y -= y1;
1221 } 1067 }
1222 1068
1223 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1224 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1225 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1226 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1227 1073
1228 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1229 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1230 dx = 0; 1076 dx = 0;
1233 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1234 dy = 0; 1080 dy = 0;
1235 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1236 dy /= 2; 1082 dy /= 2;
1237 1083
1238 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1239 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1240#else 1086#else
1241 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1242#endif 1088#endif
1243 } 1089 }
1244 1090
1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1246 1092
1247 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 { 1094 {
1249 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1250 { 1096 {
1251 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1252 window_sb_x, 0, 1098 window_sb_x, 0,
1253 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1254 resize_scrollbar (); 1100 resize_scrollbar ();
1255 } 1101 }
1256 1102
1257 if (menubar_visible ())
1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
1260 width, menuBar_TotalHeight ());
1261
1262 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1263 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1264 width, height); 1105 width, height);
1265 1106
1266 scr_clear (); 1107 scr_clear ();
1267#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1268 resize_pixmap (); 1109 resize_pixmap ();
1269#endif 1110#endif
1270 } 1111 }
1271 1112
1272 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1273 {
1274 int curr_screen = -1;
1275 int old_ncol = prev_ncol;
1276
1277 /* scr_reset only works on the primary screen */
1278 if (old_height) /* this is not the first time through */
1279 {
1280 unsigned int ocol = ncol;
1281 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1282 curr_screen = scr_change_screen (PRIMARY);
1283 ncol = ocol;
1284 }
1285
1286 scr_reset (); 1114 scr_reset ();
1287 1115
1288 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
1289 { 1117 //scr_touch (false);
1290 scr_change_screen (curr_screen);
1291 selection_check (old_ncol != ncol ? 4 : 0);
1292 }
1293 }
1294
1295 old_width = szHint.width;
1296 old_height = szHint.height;
1297 1118
1298#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1299 if (pixmap) 1120 if (pixmap)
1300 scr_touch (false); 1121 scr_touch (false);
1301#endif 1122#endif
1302 1123
1303#ifdef USE_XIM 1124#ifdef USE_XIM
1304 IMSetStatusPosition (); 1125 IMSetPosition ();
1305#endif 1126#endif
1306} 1127}
1307 1128
1308/* 1129/*
1309 * 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.
1314{ 1135{
1315 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1316 1137
1317 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1318 { 1139 {
1319 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1320 1141
1321 if (newwidth == 0) 1142 if (newwidth == 0)
1322 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1323 if (newheight == 0) 1144 if (newheight == 0)
1324 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
1338#ifdef USE_XIM 1159#ifdef USE_XIM
1339 1160
1340void 1161void
1341rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1342{ 1163{
1343 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1344 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1345} 1166}
1346 1167
1347void 1168void
1348rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1349{ 1170{
1386 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1387 1208
1388 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1389 *p = '\0'; 1210 *p = '\0';
1390 1211
1391 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1392 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1393 1214
1394 if (win != None) 1215 if (win != None)
1395 return True; 1216 return True;
1396 } 1217 }
1397 1218
1404 XPoint nspot; 1225 XPoint nspot;
1405 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1406 1227
1407 if (!Input_Context 1228 if (!Input_Context
1408 || !focus 1229 || !focus
1409 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1410 return; 1231 return;
1411 1232
1412 im_set_position (nspot); 1233 im_set_position (nspot);
1413 1234
1414 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
1433 input_method = 0; 1254 input_method = 0;
1434 } 1255 }
1435 1256
1436 Input_Context = 0; 1257 Input_Context = 0;
1437} 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
1438 1333
1439/* 1334/*
1440 * 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
1441 * open a suitable preedit type 1336 * open a suitable preedit type
1442 */ 1337 */
1449 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1450 unsigned long fg, bg; 1345 unsigned long fg, bg;
1451 const char *p; 1346 const char *p;
1452 char **s; 1347 char **s;
1453 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1454 1352
1455 set_environ (envv); 1353 set_environ (envv);
1456 1354
1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1458 return false; 1356 return false;
1459 1357
1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1461 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1462 if (input_method == NULL) 1359 if (input_method == NULL)
1463 return false; 1360 return false;
1464 1361
1465 xim = input_method->xim; 1362 xim = input_method->xim;
1485 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1486 1383
1487 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1488 { 1385 {
1489 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1490 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1491 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1492 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1493 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1494 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1495 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1496 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;
1497 1400
1498 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1499 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1500 { 1403 {
1501 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
1539 "*", 1442 "*",
1540 fheight, 1443 fheight,
1541 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1542 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1543 1446
1544 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1545 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1546 1449
1547 if (missing_charset_list) 1450 if (missing_charset_list)
1548 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1549 1452
1590 XNBackground, bg, 1493 XNBackground, bg,
1591 XNArea, &status_rect, 1494 XNArea, &status_rect,
1592 XNFontSet, fs, 1495 XNFontSet, fs,
1593 NULL); 1496 NULL);
1594 } 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
1595 1521
1596 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1597 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1598 XNClientWindow, vt, 1524 XNClientWindow, vt,
1599 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
1601 preedit_attr, 1527 preedit_attr,
1602 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1603 status_attr, NULL); 1529 status_attr, NULL);
1604 1530
1605 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1606 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1607 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1608 1534
1609 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1610 { 1536 {
1611 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1612 im_destroy (); 1538 im_destroy ();
1613 return false; 1539 return false;
1614 } 1540 }
1615 1541
1616 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
1617 IMSetStatusPosition (); 1548 IMSetPosition ();
1618 1549
1619 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1620 return true; 1550 return true;
1621} 1551}
1622 1552
1623void 1553void
1624rxvt_term::im_cb () 1554rxvt_term::im_cb ()
1630 1560
1631 make_current (); 1561 make_current ();
1632 1562
1633 im_destroy (); 1563 im_destroy ();
1634 1564
1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1636 if (Input_Context) 1565 if (Input_Context)
1637 return; 1566 return;
1638 1567
1639#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1640 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
1682 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1683#endif 1612#endif
1684} 1613}
1685 1614
1686void 1615void
1687rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1688{ 1617{
1689 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1690 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1691 1620
1692 if (!Input_Context 1621 if (!Input_Context
1693 || !focus 1622 || !focus
1694 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1695 || !IMisRunning ()) 1624 || !IMisRunning ())
1696 return; 1625 return;
1697 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 {
1698 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1699 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1700 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1701 XFree (status_attr); 1640 XFree (status_attr);
1702 1641
1703 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1704 XFree (needed_rect); 1643 XFree (needed_rect);
1705 1644
1706 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1707 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1708 1647
1709 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1710 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1711 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1712 1652
1653 XFree (status_attr);
1654 }
1655
1713 XFree (preedit_attr); 1656 XFree (preedit_attr);
1714 XFree (status_attr);
1715} 1657}
1716#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1717 1659
1718/*----------------------------------------------------------------------*/
1719rxvt_t rxvt_current_term;
1720
1721/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines