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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.215 by root, Wed Feb 1 18:36:48 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}
93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
100} 80}
101 81
102#if ENABLE_COMBINING 82#if ENABLE_COMBINING
103class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
104 84
… …
169 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
170#endif 150#endif
171#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
172 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
173#endif 153#endif
174#ifdef MENUBAR
175 menubar_ev (this, &rxvt_term::x_cb),
176#endif
177#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
178 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179#endif 156#endif
180#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
181 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
193 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
194#endif 171#endif
195#ifdef USE_XIM 172#ifdef USE_XIM
196 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
197#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
198 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
199 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
200 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
201 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
202 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
203 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
204 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
207 188
208 termlist.push_back (this); 189 termlist.push_back (this);
209 190
210#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
211 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
212
213 if (!keyboard)
214 rxvt_fatal ("out of memory, aborting.\n");
215#endif 193#endif
216} 194}
217 195
218// 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.
219// for use before an emergency exit 197// for use before an emergency exit
220void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
221{ 199{
222 if (cmd_pid) 200 if (cmd_pid)
223 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
224 202
225#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
226 privileged_utmp (RESTORE);
227#endif
228
229 pty.put ();
230} 204}
231 205
232rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
233{ 207{
234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
235
236 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
237 209
238 emergency_cleanup (); 210 emergency_cleanup ();
239 211
240#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
244#endif 216#endif
245 delete fontset[0]; 217 delete fontset[0];
246 218
247 if (display) 219 if (display)
248 { 220 {
249 dDisp;
250
251 selection_clear (); 221 selection_clear ();
252 222
253#ifdef USE_XIM 223#ifdef USE_XIM
254 im_destroy (); 224 im_destroy ();
255#endif 225#endif
256#ifdef MENUBAR
257 if (menubarGC) XFreeGC (disp, menubarGC);
258#endif
259#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
260 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
261 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
262#endif 229#endif
263#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
264 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
265#endif 232#endif
266#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
267 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
268 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
269 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
270 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
271 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
272 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
273 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
274 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
275 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
276 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
277#endif 244#endif
278#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
279 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
280 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
281 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
282#endif 249#endif
283 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
284 251
285#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286 delete menuBar.drawable;
287 //if (menuBar.win)
288 // XDestroyWindow (disp, menuBar.win);
289#endif
290 delete drawable; 252 delete drawable;
291 // destroy all windows 253 // destroy all windows
292 if (parent[0]) 254 if (parent[0])
293 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
294 } 258 }
295 259
296 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
297 delete pix_colors_focused; 261 delete pix_colors_focused;
298#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
307 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
308 free (allocated [i]); 272 free (allocated [i]);
309 273
310 free (selection.text); 274 free (selection.text);
311 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
312 free (env_windowid);
313 free (env_display); 276 free (env_display);
314 free (env_term); 277 free (env_term);
315 free (env_colorfgbg);
316 free (locale); 278 free (locale);
317 free (v_buffer); 279 free (v_buffer);
318 free (incr_buf); 280 free (incr_buf);
319 281
320 delete envv; 282 delete envv;
… …
323#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
324 delete keyboard; 286 delete keyboard;
325#endif 287#endif
326} 288}
327 289
290// child has exited, usually destroys
328void 291void
329rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
330{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
331 cmd_pid = 0; 296 cmd_pid = 0;
332 297
333 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
334 destroy (); 299 destroy ();
335} 300}
… …
338rxvt_term::destroy () 303rxvt_term::destroy ()
339{ 304{
340 if (destroy_ev.active) 305 if (destroy_ev.active)
341 return; 306 return;
342 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
343#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
344 scr_overlay_off (); 311 scr_overlay_off ();
345#endif 312#endif
346 313
347 if (display) 314 if (display)
… …
349#if USE_XIM 316#if USE_XIM
350 im_ev.stop (display); 317 im_ev.stop (display);
351#endif 318#endif
352#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
353 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
354#endif
355#if MENUBAR
356 menubar_ev.stop (display);
357#endif 321#endif
358#if TRANSPARENT 322#if TRANSPARENT
359 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
360#endif 324#endif
361 incr_ev.stop (); 325 incr_ev.stop ();
… …
404{ 368{
405 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
406 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
407} 371}
408 372
409#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
410static void 374static void
411print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
412{ 376{
413 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
414 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
462 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
463 else 427 else
464 { 428 {
465 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
466 // so just output the error and continue 430 // so just output the error and continue
467#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
468 print_x_error (display, event); 434 print_x_error (display, event);
469#else
470 old_xerror_handler (display, event);
471#endif 435#endif
472 } 436 }
473 437
474 return 0; 438 return 0;
475} 439}
… …
483 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
484} 448}
485 449
486/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
487bool 451bool
488rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
489{ 453{
454 this->envv = envv;
455
490 SET_R (this); 456 SET_R (this);
491 set_locale (""); 457 set_locale ("");
492 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
493 459
494 if (!init_vars ()) 460 if (!init_vars ())
… …
500 466
501#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
502 keyboard->register_done (); 468 keyboard->register_done ();
503#endif 469#endif
504 470
505#if MENUBAR_MAX
506 menubar_read (rs[Rs_menu]);
507#endif
508#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
509 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
510 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
511#endif 474#endif
512 475
513#if ENABLE_PERL 476 pty = ptytty::create ();
514 if (!rs[Rs_perl_ext_1])
515 rs[Rs_perl_ext_1] = "default";
516
517 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 {
521#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522 // ignore some perl-related arguments if some bozo installed us set[ug]id
523 if (rxvt_tainted ())
524 {
525 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527 {
528 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0;
531 }
532 }
533#endif
534 rxvt_perl.init ();
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537 }
538#endif
539 477
540 create_windows (argc, argv); 478 create_windows (argc, argv);
541 479
542 dDisp;
543
544 init_xlocale (); 480 init_xlocale ();
545 481
546 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
547 483
548#if 0 484#if 0
549 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
550#endif 486#endif
551 487
552#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
553 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
554 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
555#endif 491#endif
556#if (MENUBAR_MAX)
557 if (menubar_visible ())
558 XMapWindow (disp, menuBar.win);
559#endif
560#ifdef TRANSPARENT 492#ifdef TRANSPARENT
561 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
562 { 494 {
563 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
564 check_our_parents (); 496 check_our_parents ();
565 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
566 } 498 }
567#endif 499#endif
568 500
569 XMapWindow (disp, vt);
570 XMapWindow (disp, parent[0]);
571
572 set_colorfgbg (); 501 set_colorfgbg ();
573 502
574 init_command (cmd_argv); 503 init_command (cmd_argv);
575 504
576 free (cmd_argv); 505 free (cmd_argv);
577 506
578 if (pty.pty >= 0) 507 if (pty->pty >= 0)
579 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
580 509
581 check_ev.start (); 510 check_ev.start ();
582 511
583 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
584 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
585 return true; 527 return true;
586} 528}
587 529
588static struct sig_handlers 530static struct sig_handlers
589{ 531{
590 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
591 533
592 void sig_chld (sig_watcher &w)
593 {
594 // we are being called for every SIGCHLD, find the corresponding term
595 int pid;
596
597 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
598 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
599 if (pid == (*t)->cmd_pid)
600 {
601 (*t)->child_exit ();
602 break;
603 }
604 }
605
606 /* 534 /*
607 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
608 */ 536 */
609 void 537 void
610 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
611 { 539 {
612#ifdef DEBUG_CMD
613 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
614#endif
615 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
616 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
617 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
618 } 543 }
619 544
620 sig_handlers () 545 sig_handlers ()
621 : sw_chld (this, &sig_handlers::sig_chld),
622 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
623 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
624 { 548 {
625 } 549 }
626} sig_handlers; 550} sig_handlers;
627 551
628char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
629 553
630void 554void
631rxvt_init () 555rxvt_init ()
632{ 556{
557 ptytty::init ();
558
633 rxvt_environ = environ; 559 rxvt_environ = environ;
634
635 /*
636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it.
638 * We should only need to be root in these cases:
639 * 1. write utmp entries on some systems
640 * 2. chown tty on some systems
641 */
642 rxvt_privileges (SAVE);
643 rxvt_privileges (IGNORE);
644 560
645 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
647 563
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
651 566
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
683 598
684 return p; 599 return p;
685} 600}
686 601
687void * 602void *
688rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
689{ 604{
690 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
691 606
692 if (!p) 607 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
694 609
695 return p; 610 return p;
696} 611}
697
698/* ------------------------------------------------------------------------- *
699 * PRIVILEGED OPERATIONS *
700 * ------------------------------------------------------------------------- */
701/* take care of suid/sgid super-user (root) privileges */
702void
703rxvt_privileges (rxvt_privaction action)
704{
705#if ! defined(__CYGWIN32__)
706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707 /* setreuid () is the poor man's setuid (), seteuid () */
708# define seteuid(a) setreuid(-1, (a))
709# define setegid(a) setregid(-1, (a))
710# define HAVE_SETEUID
711# endif
712# ifdef HAVE_SETEUID
713 switch (action)
714 {
715 case IGNORE:
716 /*
717 * change effective uid/gid - not real uid/gid - so we can switch
718 * back to root later, as required
719 */
720 setegid (getgid ());
721 seteuid (getuid ());
722 break;
723 case SAVE:
724 saved_egid = getegid ();
725 saved_euid = geteuid ();
726 break;
727 case RESTORE:
728 setegid (saved_egid);
729 seteuid (saved_euid);
730 break;
731 }
732# else
733 switch (action)
734 {
735 case IGNORE:
736 setgid (getgid ());
737 setuid (getuid ());
738 /* FALLTHROUGH */
739 case SAVE:
740 /* FALLTHROUGH */
741 case RESTORE:
742 break;
743 }
744# endif
745#endif
746}
747
748#ifdef UTMP_SUPPORT
749void
750rxvt_term::privileged_utmp (rxvt_privaction action)
751{
752 if (OPTION (Opt_utmpInhibit)
753 || !pty.name || !*pty.name)
754 return;
755
756 rxvt_privileges (RESTORE);
757
758 if (action == SAVE)
759 makeutent (pty.name, rs[Rs_display_name]);
760 else
761 cleanutent ();
762
763 rxvt_privileges (IGNORE);
764}
765#endif
766 612
767/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
768/* 614/*
769 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
770 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
771 */ 617 */
772void 618void
773rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774{ 620{
775 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
776 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
777 unsigned int w, h; 623 unsigned int w, h;
778 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
779 dDisp;
780
781 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
782 ncol, nrow, szHint.width, szHint.height));
783 625
784 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
785 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
786 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
787 629
… …
842 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
843 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
844 686
845 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
846 688
847 sb_w = mb_h = 0; 689 sb_w = 0;
848 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
849 691
850 if (scrollbar_visible ()) 692 if (scrollBar.state)
851 { 693 {
852 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
853 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
854 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
855 window_vt_x += sb_w; 698 window_vt_x += sb_w;
856 }
857
858 if (menubar_visible ())
859 {
860 mb_h = menuBar_TotalHeight ();
861 szHint.base_height += mb_h;
862 window_vt_y += mb_h;
863 } 699 }
864 700
865 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
866 szHint.height_inc = fheight; 702 szHint.height_inc = fheight;
867 szHint.min_width = szHint.base_width + szHint.width_inc; 703 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
887 { 723 {
888 min_it (height, max_height); 724 min_it (height, max_height);
889 szHint.height = szHint.base_height + height; 725 szHint.height = szHint.base_height + height;
890 } 726 }
891 727
892 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
893 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
894 730
895 if (recalc_x) 731 if (recalc_x)
896 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
897 if (recalc_y) 734 if (recalc_y)
898 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
899 736
900 ncol = width / fwidth; 737 ncol = width / fwidth;
901 nrow = height / fheight; 738 nrow = height / fheight;
902 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
903 ncol, nrow, szHint.width,
904 szHint.height));
905 return;
906} 739}
907 740
908/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
909/* 742/*
910 * Tell the teletype handler what size the window is. 743 * Tell the teletype handler what size the window is.
911 * Called after a window size change. 744 * Called after a window size change.
912 */ 745 */
913void 746void
914rxvt_term::tt_winch () 747rxvt_term::tt_winch ()
915{ 748{
916 if (pty.pty < 0) 749 if (pty->pty < 0)
917 return; 750 return;
918 751
919 struct winsize ws; 752 struct winsize ws;
920 753
921 ws.ws_col = ncol; 754 ws.ws_col = ncol;
922 ws.ws_row = nrow; 755 ws.ws_row = nrow;
923 ws.ws_xpixel = width; 756 ws.ws_xpixel = width;
924 ws.ws_ypixel = height; 757 ws.ws_ypixel = height;
925 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 758 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926 759
927#if 0 760#if 0
928 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 761 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929 if (cmd_pid) /* force through to the command */ 762 if (cmd_pid) /* force through to the command */
930 kill (-cmd_pid, SIGWINCH); 763 kill (-cmd_pid, SIGWINCH);
… …
1010 return true; 843 return true;
1011} 844}
1012 845
1013void rxvt_term::set_string_property (Atom prop, const char *str, int len) 846void rxvt_term::set_string_property (Atom prop, const char *str, int len)
1014{ 847{
1015 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
1016 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
1017 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1018} 851}
1019 852
1020void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1021{ 854{
1022 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
1023 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
1024 857
1025 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
1026 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1027 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
1028 861
1029 free (s); 862 free (s);
1030 free (ws); 863 free (ws);
… …
1055void 888void
1056rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
1057{ 890{
1058 rxvt_color xcol; 891 rxvt_color xcol;
1059 int i; 892 int i;
1060 893
1061 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
1062 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
1063 900
1064 /* handle color aliases */ 901 /* handle color aliases */
1065 if (isdigit (*color)) 902 if (isdigit (*color))
1066 { 903 {
1067 i = atoi (color); 904 i = atoi (color);
1068 905
1069 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
1070 { /* bright colors */ 907 { /* bright colors */
1071 i -= 8; 908 i -= 8;
1072 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1073 SET_PIXCOLOR (idx);
1074 goto done; 910 goto done;
1075 } 911 }
1076 912
1077 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
1078 { /* normal colors */ 914 { /* normal colors */
1079 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1080 SET_PIXCOLOR (idx);
1081 goto done; 916 goto done;
1082 } 917 }
1083 } 918 }
1084 919
1085 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
1086 return;
1087
1088 /* XStoreColor (display->display, display->cmap, XColor*); */
1089 921
1090 /* 922 /*
1091 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
1092 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1093 */ 925 */
1094# if 0
1095 for (i = Color_Black; i <= Color_White; i++)
1096 if (pix_colors[idx] == pix_colors[i])
1097 break;
1098 if (i > Color_White)
1099 {
1100 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1101 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1102 DisplayPlanes (display->display, display->screen));
1103 }
1104# endif
1105 926
1106 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
1107 SET_PIXCOLOR (idx);
1108 928
1109 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
1110 /* Cursor cursor; */ 930 /* Cursor cursor; */
1111done: 931done:
1112 932
1113#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
1114 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
1115 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
1116#endif 940#endif
1117 941
1118 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
1119 943
1120 recolour_cursor (); 944 recolour_cursor ();
… …
1126#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
1127 951
1128void 952void
1129rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
1130{ 954{
1131 XColor xcol[2]; 955 XColor fg, bg;
1132 956
1133 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
1134 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
1135 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
1136 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
1137 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
1138 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
1139 964
1140 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1141 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1142} 966}
1143 967
1144/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
1145/* 969/*
1146 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1150{ 974{
1151 unsigned int i; 975 unsigned int i;
1152 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
1153 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1154 978
1155 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1156 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
1157 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
1158 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
1159 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
1160 { 983 {
… …
1175 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1176} 999}
1177 1000
1178/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1179 1002
1180int 1003bool
1181rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1182{ 1005{
1183 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1184 {
1185 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1186 return false;
1187 }
1188
1189 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1190} 1011}
1191 1012
1192/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1193 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1194 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
1195void 1016void
1196rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1017rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1197{ 1018{
1198 int fix_screen; 1019 int fix_screen;
1199 int old_width = szHint.width, old_height = szHint.height; 1020 int old_width = szHint.width;
1200 dDisp; 1021 int old_height = szHint.height;
1201 1022
1202 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1203 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1204 1025
1205 if (!ignoreparent) 1026 if (!ignoreparent)
1206 { 1027 {
1207#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1208 /* 1029 /*
… …
1212 int x, y, x1, y1; 1033 int x, y, x1, y1;
1213 int dx, dy; 1034 int dx, dy;
1214 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1215 Window unused_cr; 1036 Window unused_cr;
1216 1037
1217 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1218 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1219 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1220 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1221 /* 1042 /*
1222 * if display->root isn't the parent window, a WM will probably have offset 1043 * if display->root isn't the parent window, a WM will probably have offset
1223 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1224 */ 1045 */
… …
1226 { 1047 {
1227 x -= x1; 1048 x -= x1;
1228 y -= y1; 1049 y -= y1;
1229 } 1050 }
1230 1051
1231 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1232 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1233 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1234 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1235 1056
1236 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1237 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
1238 dx = 0; 1059 dx = 0;
… …
1241 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1242 dy = 0; 1063 dy = 0;
1243 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1244 dy /= 2; 1065 dy /= 2;
1245 1066
1246 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1247 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1248#else 1069#else
1249 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1250#endif 1071#endif
1251 } 1072 }
1252 1073
1253 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1254 1075
1255 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1256 { 1077 {
1257 if (scrollbar_visible ()) 1078 if (scrollBar.state)
1258 { 1079 {
1259 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1260 window_sb_x, 0, 1081 window_sb_x, 0,
1261 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1262 resize_scrollbar (); 1083 resize_scrollbar ();
1263 } 1084 }
1264 1085
1265 if (menubar_visible ())
1266 XMoveResizeWindow (disp, menuBar.win,
1267 window_vt_x, 0,
1268 width, menuBar_TotalHeight ());
1269
1270 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1271 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1272 width, height); 1088 width, height);
1273 1089
1274 scr_clear (); 1090 scr_clear ();
1275#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
1276 resize_pixmap (); 1092 resize_pixmap ();
1277#endif 1093#endif
1278 } 1094 }
1279 1095
1280 if (fix_screen || old_height == 0) 1096 if (fix_screen || old_height == 0)
1281 {
1282 int curr_screen = -1;
1283 int old_ncol = prev_ncol;
1284
1285 /* scr_reset only works on the primary screen */
1286 if (old_height) /* this is not the first time through */
1287 {
1288 unsigned int ocol = ncol;
1289 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1290 curr_screen = scr_change_screen (PRIMARY);
1291 ncol = ocol;
1292 }
1293
1294 scr_reset (); 1097 scr_reset ();
1295
1296 if (curr_screen >= 0) /* this is not the first time through */
1297 {
1298 scr_change_screen (curr_screen);
1299 selection_check (old_ncol != ncol ? 4 : 0);
1300 }
1301 }
1302
1303 old_width = szHint.width;
1304 old_height = szHint.height;
1305 1098
1306#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1307 if (pixmap) 1100 if (pixmap)
1308 scr_touch (false); 1101 scr_touch (false);
1309#endif 1102#endif
… …
1322{ 1115{
1323 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1324 1117
1325 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1326 { 1119 {
1327 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1328 1121
1329 if (newwidth == 0) 1122 if (newwidth == 0)
1330 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1331 if (newheight == 0) 1124 if (newheight == 0)
1332 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1394 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1395 1188
1396 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1397 *p = '\0'; 1190 *p = '\0';
1398 1191
1399 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1400 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1401 1194
1402 if (win != None) 1195 if (win != None)
1403 return True; 1196 return True;
1404 } 1197 }
1405 1198
… …
1412 XPoint nspot; 1205 XPoint nspot;
1413 XVaNestedList preedit_attr; 1206 XVaNestedList preedit_attr;
1414 1207
1415 if (!Input_Context 1208 if (!Input_Context
1416 || !focus 1209 || !focus
1417 || !(input_style & XIMPreeditPosition)) 1210 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1418 return; 1211 return;
1419 1212
1420 im_set_position (nspot); 1213 im_set_position (nspot);
1421 1214
1422 if (nspot.x == spot.x && nspot.y == spot.y) 1215 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1441 input_method = 0; 1234 input_method = 0;
1442 } 1235 }
1443 1236
1444 Input_Context = 0; 1237 Input_Context = 0;
1445} 1238}
1239
1240#ifdef ENABLE_XIM_ONTHESPOT
1241
1242static void
1243xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1244{
1245 ((rxvt_term *)client_data)->make_current ();
1246 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1247}
1248
1249static void
1250xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1251{
1252 ((rxvt_term *)client_data)->make_current ();
1253 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1254}
1255
1256static void
1257xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1258{
1259 rxvt_term *term = (rxvt_term *)client_data;
1260 XIMText *text = call_data->text;
1261
1262 term->make_current ();
1263
1264 if (text)
1265 {
1266 void *str;
1267
1268 if (!text->encoding_is_wchar && text->string.multi_byte)
1269 {
1270 // of course, X makes it ugly again
1271 if (term->rs[Rs_imLocale])
1272 SET_LOCALE (term->rs[Rs_imLocale]);
1273
1274 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1275 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1276
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale);
1279 }
1280 else
1281 str = (void *)text->string.wide_char;
1282
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1288 DT_WCS_LEN, str, str ? (int)text->length : 0,
1289 DT_END));
1290 }
1291 else
1292 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1293 DT_INT, call_data->caret,
1294 DT_INT, call_data->chg_first,
1295 DT_INT, call_data->chg_length,
1296 DT_END));
1297}
1298
1299#if 0
1300static void
1301xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1302{
1303 ((rxvt_term *)client_data)->make_current ();
1304 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1305 DT_INT, call_data->position,
1306 DT_INT, call_data->direction,
1307 DT_INT, call_data->style,
1308 DT_END));
1309}
1310#endif
1311
1312#endif
1446 1313
1447/* 1314/*
1448 * Try to open a XIM with the current modifiers, then see if we can 1315 * Try to open a XIM with the current modifiers, then see if we can
1449 * open a suitable preedit type 1316 * open a suitable preedit type
1450 */ 1317 */
… …
1457 XRectangle rect, status_rect, needed_rect; 1324 XRectangle rect, status_rect, needed_rect;
1458 unsigned long fg, bg; 1325 unsigned long fg, bg;
1459 const char *p; 1326 const char *p;
1460 char **s; 1327 char **s;
1461 XIMStyles *xim_styles; 1328 XIMStyles *xim_styles;
1329#ifdef ENABLE_XIM_ONTHESPOT
1330 XIMCallback xcb[4];
1331#endif
1462 1332
1463 set_environ (envv); 1333 set_environ (envv);
1464 1334
1465 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1335 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1466 return false; 1336 return false;
1467 1337
1468 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1469 input_method = display->get_xim (locale, modifiers); 1338 input_method = display->get_xim (locale, modifiers);
1470 if (input_method == NULL) 1339 if (input_method == NULL)
1471 return false; 1340 return false;
1472 1341
1473 xim = input_method->xim; 1342 xim = input_method->xim;
… …
1493 s = rxvt_splitcommastring (p); 1362 s = rxvt_splitcommastring (p);
1494 1363
1495 for (i = found = 0; !found && s[i]; i++) 1364 for (i = found = 0; !found && s[i]; i++)
1496 { 1365 {
1497 if (!strcmp (s[i], "OverTheSpot")) 1366 if (!strcmp (s[i], "OverTheSpot"))
1498 input_style = (XIMPreeditPosition | XIMStatusNothing); 1367 input_style = XIMPreeditPosition | XIMStatusNothing;
1499 else if (!strcmp (s[i], "OffTheSpot")) 1368 else if (!strcmp (s[i], "OffTheSpot"))
1500 input_style = (XIMPreeditArea | XIMStatusArea); 1369 input_style = XIMPreeditArea | XIMStatusArea;
1501 else if (!strcmp (s[i], "Root")) 1370 else if (!strcmp (s[i], "Root"))
1502 input_style = (XIMPreeditNothing | XIMStatusNothing); 1371 input_style = XIMPreeditNothing | XIMStatusNothing;
1503 else if (!strcmp (s[i], "None")) 1372 else if (!strcmp (s[i], "None"))
1504 input_style = (XIMPreeditNone | XIMStatusNone); 1373 input_style = XIMPreeditNone | XIMStatusNone;
1374#ifdef ENABLE_XIM_ONTHESPOT
1375 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1376 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1377#endif
1378 else
1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1505 1380
1506 for (j = 0; j < xim_styles->count_styles; j++) 1381 for (j = 0; j < xim_styles->count_styles; j++)
1507 if (input_style == xim_styles->supported_styles[j]) 1382 if (input_style == xim_styles->supported_styles[j])
1508 { 1383 {
1509 rxvt_freecommastring (s); 1384 rxvt_freecommastring (s);
… …
1547 "*", 1422 "*",
1548 fheight, 1423 fheight,
1549 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1550 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1551 1426
1552 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1553 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1554 1429
1555 if (missing_charset_list) 1430 if (missing_charset_list)
1556 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1557 1432
… …
1598 XNBackground, bg, 1473 XNBackground, bg,
1599 XNArea, &status_rect, 1474 XNArea, &status_rect,
1600 XNFontSet, fs, 1475 XNFontSet, fs,
1601 NULL); 1476 NULL);
1602 } 1477 }
1478#if ENABLE_XIM_ONTHESPOT
1479 else if (input_style & XIMPreeditCallbacks)
1480 {
1481 im_set_position (spot);
1482
1483 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1484 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1485 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1486# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1488# endif
1489
1490 preedit_attr = XVaCreateNestedList (0,
1491 XNSpotLocation, &spot,
1492 XNPreeditStartCallback, &xcb[0],
1493 XNPreeditDoneCallback , &xcb[1],
1494 XNPreeditDrawCallback , &xcb[2],
1495# if 0
1496 XNPreeditCaretCallback, &xcb[3],
1497# endif
1498 NULL);
1499 }
1500#endif
1603 1501
1604 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1605 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1606 XNClientWindow, vt, 1504 XNClientWindow, vt,
1607 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1610 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1611 status_attr, NULL); 1509 status_attr, NULL);
1612 1510
1613 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1614 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1615 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1616 1514
1617 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1618 { 1516 {
1619 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1620 im_destroy (); 1518 im_destroy ();
1621 return false; 1519 return false;
1622 } 1520 }
1623 1521
1522#if 0
1523 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input ();
1526#endif
1527
1624 if (input_style & XIMPreeditArea) 1528 if (input_style & XIMPreeditArea)
1625 IMSetStatusPosition (); 1529 IMSetStatusPosition ();
1626 1530
1627 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1628 return true; 1531 return true;
1629} 1532}
1630 1533
1631void 1534void
1632rxvt_term::im_cb () 1535rxvt_term::im_cb ()
… …
1638 1541
1639 make_current (); 1542 make_current ();
1640 1543
1641 im_destroy (); 1544 im_destroy ();
1642 1545
1643 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1644 if (Input_Context) 1546 if (Input_Context)
1645 return; 1547 return;
1646 1548
1647#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1549#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1648 if (rs[Rs_imLocale]) 1550 if (rs[Rs_imLocale])
… …
1721 XFree (preedit_attr); 1623 XFree (preedit_attr);
1722 XFree (status_attr); 1624 XFree (status_attr);
1723} 1625}
1724#endif /* USE_XIM */ 1626#endif /* USE_XIM */
1725 1627
1726/*----------------------------------------------------------------------*/
1727rxvt_t rxvt_current_term;
1728
1729/*----------------------- end-of-file (C source) -----------------------*/ 1628/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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