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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines