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.218 by root, Thu Feb 2 18:04:46 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 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 204}
223 205
224rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
225{ 207{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
229 209
230 emergency_cleanup (); 210 emergency_cleanup ();
231 211
232#if ENABLE_STYLES 212#if ENABLE_STYLES
236#endif 216#endif
237 delete fontset[0]; 217 delete fontset[0];
238 218
239 if (display) 219 if (display)
240 { 220 {
241 dDisp;
242
243 selection_clear (); 221 selection_clear ();
244 222
245#ifdef USE_XIM 223#ifdef USE_XIM
246 im_destroy (); 224 im_destroy ();
247#endif 225#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif
251#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
254#endif 229#endif
255#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
256 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
257#endif 232#endif
258#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
259 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
260 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
261 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
262 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
263 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
264 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
265 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
269#endif 244#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
274#endif 249#endif
275 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, gc);
276 251
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; 252 delete drawable;
283 // destroy all windows 253 // destroy all windows
284 if (parent[0]) 254 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (dpy, parent[0]);
286 }
287 256
288 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
289 delete pix_colors_focused; 269 delete pix_colors_focused;
290#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
291 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
292#endif 272#endif
293 273
299 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
300 free (allocated [i]); 280 free (allocated [i]);
301 281
302 free (selection.text); 282 free (selection.text);
303 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
304 free (env_windowid);
305 free (env_display); 284 free (env_display);
306 free (env_term); 285 free (env_term);
307 free (env_colorfgbg);
308 free (locale); 286 free (locale);
309 free (v_buffer); 287 free (v_buffer);
310 free (incr_buf); 288 free (incr_buf);
311 289
312 delete envv; 290 delete envv;
315#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
316 delete keyboard; 294 delete keyboard;
317#endif 295#endif
318} 296}
319 297
298// child has exited, usually destroys
320void 299void
321rxvt_term::child_exit () 300rxvt_term::child_cb (child_watcher &w, int status)
322{ 301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
323 cmd_pid = 0; 304 cmd_pid = 0;
324 305
325 if (!OPTION (Opt_hold)) 306 if (!OPTION (Opt_hold))
326 destroy (); 307 destroy ();
327} 308}
330rxvt_term::destroy () 311rxvt_term::destroy ()
331{ 312{
332 if (destroy_ev.active) 313 if (destroy_ev.active)
333 return; 314 return;
334 315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317
335#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
336 scr_overlay_off (); 319 scr_overlay_off ();
337#endif 320#endif
338 321
339 if (display) 322 if (display)
341#if USE_XIM 324#if USE_XIM
342 im_ev.stop (display); 325 im_ev.stop (display);
343#endif 326#endif
344#if HAVE_SCROLLBARS 327#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 329#endif
350#if TRANSPARENT 330#if TRANSPARENT
351 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
352#endif 332#endif
353 incr_ev.stop (); 333 incr_ev.stop ();
396{ 376{
397 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
398 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
399} 379}
400 380
401#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
402static void 382static void
403print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
404{ 384{
405 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
406 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
454 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
455 else 435 else
456 { 436 {
457 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
458 // so just output the error and continue 438 // so just output the error and continue
459#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
460 print_x_error (display, event); 442 print_x_error (display, event);
461#else
462 old_xerror_handler (display, event);
463#endif 443#endif
464 } 444 }
465 445
466 return 0; 446 return 0;
467} 447}
475 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
476} 456}
477 457
478/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
479bool 459bool
480rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
481{ 461{
462 this->envv = envv;
463
482 SET_R (this); 464 SET_R (this);
483 set_locale (""); 465 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :( 466 set_environ (envv); // few things in X do not call setlocale :(
485 467
486 if (!init_vars ()) 468 if (!init_vars ())
492 474
493#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 476 keyboard->register_done ();
495#endif 477#endif
496 478
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 482#endif
504 483
505#if ENABLE_PERL 484 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 485
532 create_windows (argc, argv); 486 create_windows (argc, argv);
533 487
534 dDisp;
535
536 init_xlocale (); 488 init_xlocale ();
537 489
538 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
539 491
540#if 0 492#if 0
541 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
542#endif 494#endif
543 495
544#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
547#endif 499#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif
552#ifdef TRANSPARENT 500#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
554 { 502 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
556 check_our_parents (); 504 check_our_parents ();
557 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
558 } 506 }
559#endif 507#endif
560 508
561 XMapWindow (disp, vt);
562 XMapWindow (disp, parent[0]);
563
564 set_colorfgbg (); 509 set_colorfgbg ();
565 510
566 init_command (cmd_argv); 511 init_command (cmd_argv);
567 512
568 free (cmd_argv); 513 free (cmd_argv);
569 514
570 if (pty.pty >= 0) 515 if (pty->pty >= 0)
571 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
572 517
573 check_ev.start (); 518 check_ev.start ();
574 519
575 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
576 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (dpy, vt);
533 XMapWindow (dpy, parent[0]);
534
577 return true; 535 return true;
578} 536}
579 537
580static struct sig_handlers 538static struct sig_handlers
581{ 539{
582 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
583 541
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 /* 542 /*
599 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
600 */ 544 */
601 void 545 void
602 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
603 { 547 {
604#ifdef DEBUG_CMD
605 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
606#endif
607 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
608 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
609 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
610 } 551 }
611 552
612 sig_handlers () 553 sig_handlers ()
613 : sw_chld (this, &sig_handlers::sig_chld),
614 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
616 { 556 {
617 } 557 }
618} sig_handlers; 558} sig_handlers;
619 559
620char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
621 561
622void 562void
623rxvt_init () 563rxvt_init ()
624{ 564{
565 ptytty::init ();
566
625 rxvt_environ = environ; 567 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 568
637 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
638 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
639 571
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
643 574
644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
645 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
674 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
675 606
676 return p; 607 return p;
677} 608}
678 609
679void * 610void *
680rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
681{ 612{
682 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
683 614
684 if (!p) 615 if (!p)
685 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
686 617
687 return p; 618 return p;
688} 619}
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 620
759/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
760/* 622/*
761 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
762 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
763 */ 625 */
764void 626void
765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766{ 628{
767 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
768 int x, y, sb_w, mb_h, flags; 630 int x, y, sb_w, flags;
769 unsigned int w, h; 631 unsigned int w, h;
770 unsigned int max_width, max_height; 632 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 633
776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
777 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
779 637
834 max_width = MAX_COLS * fwidth; 692 max_width = MAX_COLS * fwidth;
835 max_height = MAX_ROWS * fheight; 693 max_height = MAX_ROWS * fheight;
836 694
837 szHint.base_width = szHint.base_height = 2 * int_bwidth; 695 szHint.base_width = szHint.base_height = 2 * int_bwidth;
838 696
839 sb_w = mb_h = 0; 697 sb_w = 0;
840 window_vt_x = window_vt_y = int_bwidth; 698 window_vt_x = window_vt_y = int_bwidth;
841 699
842 if (scrollbar_visible ()) 700 if (scrollBar.state)
843 { 701 {
844 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
845 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
846 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
847 window_vt_x += sb_w; 706 window_vt_x += sb_w;
848 }
849
850 if (menubar_visible ())
851 {
852 mb_h = menuBar_TotalHeight ();
853 szHint.base_height += mb_h;
854 window_vt_y += mb_h;
855 } 707 }
856 708
857 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
858 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
859 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
879 { 731 {
880 min_it (height, max_height); 732 min_it (height, max_height);
881 szHint.height = szHint.base_height + height; 733 szHint.height = szHint.base_height + height;
882 } 734 }
883 735
884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
885 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
886 738
887 if (recalc_x) 739 if (recalc_x)
888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
889 if (recalc_y) 742 if (recalc_y)
890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
891 744
892 ncol = width / fwidth; 745 ncol = width / fwidth;
893 nrow = height / fheight; 746 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} 747}
899 748
900/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
901/* 750/*
902 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
903 * Called after a window size change. 752 * Called after a window size change.
904 */ 753 */
905void 754void
906rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
907{ 756{
908 if (pty.pty < 0) 757 if (pty->pty < 0)
909 return; 758 return;
910 759
911 struct winsize ws; 760 struct winsize ws;
912 761
913 ws.ws_col = ncol; 762 ws.ws_col = ncol;
914 ws.ws_row = nrow; 763 ws.ws_row = nrow;
915 ws.ws_xpixel = width; 764 ws.ws_xpixel = width;
916 ws.ws_ypixel = height; 765 ws.ws_ypixel = height;
917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
918 767
919#if 0 768#if 0
920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
921 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
922 kill (-cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
1002 return true; 851 return true;
1003} 852}
1004 853
1005void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
1006{ 855{
1007 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
1008 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
1009 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1010} 859}
1011 860
1012void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1013{ 862{
1014 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
1015 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
1016 865
1017 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1019 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
1020 869
1021 free (s); 870 free (s);
1022 free (ws); 871 free (ws);
1047void 896void
1048rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
1049{ 898{
1050 rxvt_color xcol; 899 rxvt_color xcol;
1051 int i; 900 int i;
1052 901
1053 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
1054 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
1055 908
1056 /* handle color aliases */ 909 /* handle color aliases */
1057 if (isdigit (*color)) 910 if (isdigit (*color))
1058 { 911 {
1059 i = atoi (color); 912 i = atoi (color);
1060 913
1061 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1062 { /* bright colors */ 915 { /* bright colors */
1063 i -= 8; 916 i -= 8;
1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1065 SET_PIXCOLOR (idx);
1066 goto done; 918 goto done;
1067 } 919 }
1068 920
1069 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1070 { /* normal colors */ 922 { /* normal colors */
1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1072 SET_PIXCOLOR (idx);
1073 goto done; 924 goto done;
1074 } 925 }
1075 } 926 }
1076 927
1077 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1078 return;
1079
1080 /* XStoreColor (display->display, display->cmap, XColor*); */
1081 929
1082 /* 930 /*
1083 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
1084 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1085 */ 933 */
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 934
1098 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1099 SET_PIXCOLOR (idx);
1100 936
1101 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1102 /* Cursor cursor; */ 938 /* Cursor cursor; */
1103done: 939done:
1104 940
1105#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1106 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1107 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
1108#endif 948#endif
1109 949
1110 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1111 951
1112 recolour_cursor (); 952 recolour_cursor ();
1118#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1119 959
1120void 960void
1121rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1122{ 962{
1123 XColor xcol[2]; 963 XColor fg, bg;
1124 964
1125 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1126 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1127 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1128 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1129 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1130 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1131 972
1132 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1133 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1134} 974}
1135 975
1136/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1137/* 977/*
1138 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
1142{ 982{
1143 unsigned int i; 983 unsigned int i;
1144 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1145 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1146 986
1147 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1148 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1149 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1150 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1151 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1152 { 991 {
1167 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1168} 1007}
1169 1008
1170/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1171 1010
1172int 1011bool
1173rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1174{ 1013{
1175 if (!screen_in_out->set (display, colour)) 1014 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; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1182} 1025}
1183 1026
1184/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1185 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1186 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1187void 1030void
1188rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1189{ 1032{
1190 int fix_screen; 1033 int fix_screen;
1191 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1192 dDisp; 1035 int old_height = szHint.height;
1193 1036
1194 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1195 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (dpy, parent[0], &szHint);
1196 1039
1197 if (!ignoreparent) 1040 if (!ignoreparent)
1198 { 1041 {
1199#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1200 /* 1043 /*
1204 int x, y, x1, y1; 1047 int x, y, x1, y1;
1205 int dx, dy; 1048 int dx, dy;
1206 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1207 Window unused_cr; 1050 Window unused_cr;
1208 1051
1209 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (dpy, parent[0], display->root,
1210 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1211 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1212 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1213 /* 1056 /*
1214 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1215 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1216 */ 1059 */
1218 { 1061 {
1219 x -= x1; 1062 x -= x1;
1220 y -= y1; 1063 y -= y1;
1221 } 1064 }
1222 1065
1223 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1224 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1225 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1226 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1227 1070
1228 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1229 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1230 dx = 0; 1073 dx = 0;
1233 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1234 dy = 0; 1077 dy = 0;
1235 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1236 dy /= 2; 1079 dy /= 2;
1237 1080
1238 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1239 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1240#else 1083#else
1241 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1242#endif 1085#endif
1243 } 1086 }
1244 1087
1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1246 1089
1247 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 { 1091 {
1249 if (scrollbar_visible ()) 1092 if (scrollBar.state)
1250 { 1093 {
1251 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (dpy, scrollBar.win,
1252 window_sb_x, 0, 1095 window_sb_x, 0,
1253 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1254 resize_scrollbar (); 1097 resize_scrollbar ();
1255 } 1098 }
1256 1099
1257 if (menubar_visible ())
1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
1260 width, menuBar_TotalHeight ());
1261
1262 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (dpy, vt,
1263 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1264 width, height); 1102 width, height);
1265 1103
1266 scr_clear (); 1104 scr_clear ();
1267#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1268 resize_pixmap (); 1106 resize_pixmap ();
1269#endif 1107#endif
1270 } 1108 }
1271 1109
1272 if (fix_screen || old_height == 0) 1110 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 (); 1111 scr_reset ();
1287 1112
1288 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1289 { 1114 //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 1115
1298#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1299 if (pixmap) 1117 if (pixmap)
1300 scr_touch (false); 1118 scr_touch (false);
1301#endif 1119#endif
1314{ 1132{
1315 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1316 1134
1317 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1318 { 1136 {
1319 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (dpy, display->root, &wattr);
1320 1138
1321 if (newwidth == 0) 1139 if (newwidth == 0)
1322 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1323 if (newheight == 0) 1141 if (newheight == 0)
1324 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
1338#ifdef USE_XIM 1156#ifdef USE_XIM
1339 1157
1340void 1158void
1341rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1342{ 1160{
1343 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1344 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1345} 1163}
1346 1164
1347void 1165void
1348rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1349{ 1167{
1386 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1387 1205
1388 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1389 *p = '\0'; 1207 *p = '\0';
1390 1208
1391 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (dpy, server, False);
1392 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (dpy, atom);
1393 1211
1394 if (win != None) 1212 if (win != None)
1395 return True; 1213 return True;
1396 } 1214 }
1397 1215
1404 XPoint nspot; 1222 XPoint nspot;
1405 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1406 1224
1407 if (!Input_Context 1225 if (!Input_Context
1408 || !focus 1226 || !focus
1409 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1410 return; 1228 return;
1411 1229
1412 im_set_position (nspot); 1230 im_set_position (nspot);
1413 1231
1414 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
1433 input_method = 0; 1251 input_method = 0;
1434 } 1252 }
1435 1253
1436 Input_Context = 0; 1254 Input_Context = 0;
1437} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (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_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1438 1330
1439/* 1331/*
1440 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1441 * open a suitable preedit type 1333 * open a suitable preedit type
1442 */ 1334 */
1449 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1450 unsigned long fg, bg; 1342 unsigned long fg, bg;
1451 const char *p; 1343 const char *p;
1452 char **s; 1344 char **s;
1453 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1454 1349
1455 set_environ (envv); 1350 set_environ (envv);
1456 1351
1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1458 return false; 1353 return false;
1459 1354
1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1461 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1462 if (input_method == NULL) 1356 if (input_method == NULL)
1463 return false; 1357 return false;
1464 1358
1465 xim = input_method->xim; 1359 xim = input_method->xim;
1485 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1486 1380
1487 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1488 { 1382 {
1489 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1490 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1491 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1492 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1493 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1494 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1495 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1496 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1497 1397
1498 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1499 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1500 { 1400 {
1501 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
1539 "*", 1439 "*",
1540 fheight, 1440 fheight,
1541 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1542 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1543 1443
1544 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1545 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1546 1446
1547 if (missing_charset_list) 1447 if (missing_charset_list)
1548 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1549 1449
1590 XNBackground, bg, 1490 XNBackground, bg,
1591 XNArea, &status_rect, 1491 XNArea, &status_rect,
1592 XNFontSet, fs, 1492 XNFontSet, fs,
1593 NULL); 1493 NULL);
1594 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1595 1518
1596 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1597 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1598 XNClientWindow, vt, 1521 XNClientWindow, vt,
1599 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
1602 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1603 status_attr, NULL); 1526 status_attr, NULL);
1604 1527
1605 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1606 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1607 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (dpy, fs);
1608 1531
1609 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1610 { 1533 {
1611 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1612 im_destroy (); 1535 im_destroy ();
1613 return false; 1536 return false;
1614 } 1537 }
1615 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1616 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1617 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1618 1547
1619 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1620 return true; 1548 return true;
1621} 1549}
1622 1550
1623void 1551void
1624rxvt_term::im_cb () 1552rxvt_term::im_cb ()
1630 1558
1631 make_current (); 1559 make_current ();
1632 1560
1633 im_destroy (); 1561 im_destroy ();
1634 1562
1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1636 if (Input_Context) 1563 if (Input_Context)
1637 return; 1564 return;
1638 1565
1639#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1640 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])
1713 XFree (preedit_attr); 1640 XFree (preedit_attr);
1714 XFree (status_attr); 1641 XFree (status_attr);
1715} 1642}
1716#endif /* USE_XIM */ 1643#endif /* USE_XIM */
1717 1644
1718/*----------------------------------------------------------------------*/
1719rxvt_t rxvt_current_term;
1720
1721/*----------------------- end-of-file (C source) -----------------------*/ 1645/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines