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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines