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.167 by root, Sun Jan 8 08:43:11 2006 UTC vs.
Revision 1.207 by root, Wed Jan 25 21:09:21 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__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
56vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
57 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
58static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
59 57
60bool 58bool
61rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
62{ 60{
63 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
64 return false; 62 return false;
65 63
66 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
67 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
68 return true; 66 return true;
69} 67}
70 68
71bool 69void
72rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
73{ 71{
74 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
75 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
76} 74}
77 75
78void 76void
79rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
80{ 78{
81 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
82} 80}
83 81
84#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
151 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
152#endif 150#endif
153#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
154 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
155#endif 153#endif
156#ifdef MENUBAR
157 menubar_ev (this, &rxvt_term::x_cb),
158#endif
159#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
161#endif 156#endif
162#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
163 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
175 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
176#endif 171#endif
177#ifdef USE_XIM 172#ifdef USE_XIM
178 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
179#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
180 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
181 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
182 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
183 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
184 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
185 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
186 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
189 188
190 termlist.push_back (this); 189 termlist.push_back (this);
191 190
192#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
193 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
194
195 if (!keyboard)
196 rxvt_fatal ("out of memory, aborting.\n");
197#endif 193#endif
198} 194}
199 195
200// 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.
201// for use before an emergency exit 197// for use before an emergency exit
202void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
203{ 199{
204 if (cmd_pid) 200 if (cmd_pid)
205 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
206 202
207#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
208 privileged_utmp (RESTORE);
209#endif
210
211 pty.put ();
212} 204}
213 205
214rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
215{ 207{
216 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
217
218 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
219 209
220 emergency_cleanup (); 210 emergency_cleanup ();
221 211
222#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
226#endif 216#endif
227 delete fontset[0]; 217 delete fontset[0];
228 218
229 if (display) 219 if (display)
230 { 220 {
231 dDisp;
232
233 selection_clear (); 221 selection_clear ();
234 222
235#ifdef USE_XIM 223#ifdef USE_XIM
236 im_destroy (); 224 im_destroy ();
237#endif 225#endif
238#ifdef MENUBAR
239 if (menubarGC) XFreeGC (disp, menubarGC);
240#endif
241#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
243 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
244#endif 229#endif
245#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
247#endif 232#endif
248#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
250 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
251 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
252 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
253 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
254 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
255 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
256 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
257 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
258 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
259#endif 244#endif
260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
262 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
263 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
264#endif 249#endif
265 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
266 251
267#if defined(MENUBAR) && (MENUBAR_MAX > 1)
268 delete menuBar.drawable;
269 //if (menuBar.win)
270 // XDestroyWindow (disp, menuBar.win);
271#endif
272 delete drawable; 252 delete drawable;
273 // destroy all windows 253 // destroy all windows
274 if (parent[0]) 254 if (parent[0])
275 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
276 } 258 }
277 259
278 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
279
280 delete pix_colors_focused; 261 delete pix_colors_focused;
281#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
282 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
283#endif 264#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
286#endif
287 265
288 displays.put (display); 266 displays.put (display);
289 267
290 scr_release (); 268 scr_release ();
291 269
… …
293 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
294 free (allocated [i]); 272 free (allocated [i]);
295 273
296 free (selection.text); 274 free (selection.text);
297 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
298 free (env_windowid);
299 free (env_display); 276 free (env_display);
300 free (env_term); 277 free (env_term);
301 free (env_colorfgbg);
302 free (locale); 278 free (locale);
303 free (v_buffer); 279 free (v_buffer);
304 free (incr_buf); 280 free (incr_buf);
305 281
306 delete envv; 282 delete envv;
… …
309#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
310 delete keyboard; 286 delete keyboard;
311#endif 287#endif
312} 288}
313 289
290// child has exited, usually destroys
314void 291void
315rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
316{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
317 cmd_pid = 0; 296 cmd_pid = 0;
318 297
319 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
320 destroy (); 299 destroy ();
321} 300}
… …
324rxvt_term::destroy () 303rxvt_term::destroy ()
325{ 304{
326 if (destroy_ev.active) 305 if (destroy_ev.active)
327 return; 306 return;
328 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
329#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
330 scr_overlay_off (); 311 scr_overlay_off ();
331#endif 312#endif
332 313
333 if (display) 314 if (display)
… …
335#if USE_XIM 316#if USE_XIM
336 im_ev.stop (display); 317 im_ev.stop (display);
337#endif 318#endif
338#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
339 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
340#endif
341#if MENUBAR
342 menubar_ev.stop (display);
343#endif 321#endif
344#if TRANSPARENT 322#if TRANSPARENT
345 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
346#endif 324#endif
347 incr_ev.stop (); 325 incr_ev.stop ();
… …
371} 349}
372 350
373void 351void
374rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
375{ 353{
376 SET_R (this); 354 make_current ();
377 355
378 delete this; 356 delete this;
379} 357}
380 358
381/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
469 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
470} 448}
471 449
472/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
473bool 451bool
474rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{ 453{
454 this->envv = envv;
455
476 SET_R (this); 456 SET_R (this);
477
478 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
479 459
480 if (!init_vars ()) 460 if (!init_vars ())
481 return false; 461 return false;
482 462
483 init_secondary (); 463 init_secondary ();
… …
486 466
487#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
488 keyboard->register_done (); 468 keyboard->register_done ();
489#endif 469#endif
490 470
491#if MENUBAR_MAX
492 menubar_read (rs[Rs_menu]);
493#endif
494#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
495 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
497#endif 474#endif
498 475
499#if ENABLE_PERL 476 pty = ptytty::create ();
500 if (!rs[Rs_perl_ext_1])
501 rs[Rs_perl_ext_1] = "default";
502
503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
524 rxvt_perl.init (tainted);
525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526 }
527#endif
528 477
529 create_windows (argc, argv); 478 create_windows (argc, argv);
530 479
531 dDisp;
532
533 init_xlocale (); 480 init_xlocale ();
534 481
535 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
536 483
537#if 0 484#if 0
538 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
539#endif 486#endif
540 487
541#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
542 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
543 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
544#endif 491#endif
545#if (MENUBAR_MAX)
546 if (menubar_visible ())
547 XMapWindow (disp, menuBar.win);
548#endif
549#ifdef TRANSPARENT 492#ifdef TRANSPARENT
550 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
551 { 494 {
552 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
553 check_our_parents (); 496 check_our_parents ();
554 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
555 } 498 }
556#endif 499#endif
557 500
558 XMapWindow (disp, vt);
559 XMapWindow (disp, parent[0]);
560
561 set_colorfgbg (); 501 set_colorfgbg ();
562 502
563 init_command (cmd_argv); 503 init_command (cmd_argv);
564 504
565 free (cmd_argv); 505 free (cmd_argv);
566 506
567 if (pty.pty >= 0) 507 if (pty->pty >= 0)
568 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
569 509
570 check_ev.start (); 510 check_ev.start ();
571 511
572 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
573 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
574 return true; 527 return true;
575} 528}
576 529
577static struct sig_handlers 530static struct sig_handlers
578{ 531{
579 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
580 533
581 void sig_chld (sig_watcher &w)
582 {
583 // we are being called for every SIGCHLD, find the corresponding term
584 int pid;
585
586 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
587 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
588 if (pid == (*t)->cmd_pid)
589 {
590 (*t)->child_exit ();
591 break;
592 }
593 }
594
595 /* 534 /*
596 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
597 */ 536 */
598 void 537 void
599 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
600 { 539 {
601#ifdef DEBUG_CMD
602 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
603#endif
604 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
605 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
606 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
607 } 543 }
608 544
609 sig_handlers () 545 sig_handlers ()
610 : sw_chld (this, &sig_handlers::sig_chld),
611 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
613 { 548 {
614 } 549 }
615} sig_handlers; 550} sig_handlers;
616 551
552char **rxvt_environ; // startup environment
553
617void 554void
618rxvt_init () 555rxvt_init ()
619{ 556{
620 /* 557 ptytty::init ();
621 * Save and then give up any super-user privileges 558
622 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
623 * We should only need to be root in these cases:
624 * 1. write utmp entries on some systems
625 * 2. chown tty on some systems
626 */
627 rxvt_privileges (SAVE);
628 rxvt_privileges (IGNORE);
629 560
630 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
631 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
632 563
633 sig_handlers.sw_chld.start (SIGCHLD);
634 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
635 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
636 566
637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
638 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
639 569
640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
642 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
643 573
644#ifdef USE_XGETDEFAULT
645 XrmInitialize (); 574 XrmInitialize ();
646#endif
647} 575}
648 576
649/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
669 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
670 598
671 return p; 599 return p;
672} 600}
673 601
674void * 602void *
675rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
676{ 604{
677 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
678 606
679 if (!p) 607 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
681 609
682 return p; 610 return p;
683} 611}
684
685/* ------------------------------------------------------------------------- *
686 * PRIVILEGED OPERATIONS *
687 * ------------------------------------------------------------------------- */
688/* take care of suid/sgid super-user (root) privileges */
689void
690rxvt_privileges (rxvt_privaction action)
691{
692#if ! defined(__CYGWIN32__)
693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
694 /* setreuid () is the poor man's setuid (), seteuid () */
695# define seteuid(a) setreuid(-1, (a))
696# define setegid(a) setregid(-1, (a))
697# define HAVE_SETEUID
698# endif
699# ifdef HAVE_SETEUID
700 switch (action)
701 {
702 case IGNORE:
703 /*
704 * change effective uid/gid - not real uid/gid - so we can switch
705 * back to root later, as required
706 */
707 seteuid (getuid ());
708 setegid (getgid ());
709 break;
710 case SAVE:
711 saved_euid = geteuid ();
712 saved_egid = getegid ();
713 break;
714 case RESTORE:
715 seteuid (saved_euid);
716 setegid (saved_egid);
717 break;
718 }
719# else
720 switch (action)
721 {
722 case IGNORE:
723 setuid (getuid ());
724 setgid (getgid ());
725 /* FALLTHROUGH */
726 case SAVE:
727 /* FALLTHROUGH */
728 case RESTORE:
729 break;
730 }
731# endif
732#endif
733}
734
735#ifdef UTMP_SUPPORT
736void
737rxvt_term::privileged_utmp (rxvt_privaction action)
738{
739 if (OPTION (Opt_utmpInhibit)
740 || !pty.name || !*pty.name)
741 return;
742
743 rxvt_privileges (RESTORE);
744
745 if (action == SAVE)
746 makeutent (pty.name, rs[Rs_display_name]);
747 else
748 cleanutent ();
749
750 rxvt_privileges (IGNORE);
751}
752#endif
753 612
754/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
755/* 614/*
756 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
757 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
758 */ 617 */
759void 618void
760rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
761{ 620{
762 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
763 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
764 unsigned int w, h; 623 unsigned int w, h;
765 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
766 dDisp;
767
768 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width, szHint.height));
770 625
771 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
772 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
773 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
774 629
… …
829 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
830 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
831 686
832 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
833 688
834 sb_w = mb_h = 0; 689 sb_w = 0;
835 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
836 691
837 if (scrollbar_visible ()) 692 if (scrollBar.state)
838 { 693 {
839 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
840 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
841 if (!OPTION (Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
842 window_vt_x += sb_w; 697 window_vt_x += sb_w;
843 } 698 }
844 699
845 if (menubar_visible ())
846 {
847 mb_h = menuBar_TotalHeight ();
848 szHint.base_height += mb_h;
849 window_vt_y += mb_h;
850 }
851
852 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
853 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
854 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
855 szHint.min_height = szHint.base_height + szHint.height_inc; 703 szHint.min_height = szHint.base_height + szHint.height_inc;
856 704
… …
874 { 722 {
875 min_it (height, max_height); 723 min_it (height, max_height);
876 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
877 } 725 }
878 726
879 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
880 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
881 729
882 if (recalc_x) 730 if (recalc_x)
883 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
884 if (recalc_y) 733 if (recalc_y)
885 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
886 735
887 ncol = width / fwidth; 736 ncol = width / fwidth;
888 nrow = height / fheight; 737 nrow = height / fheight;
889 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
890 ncol, nrow, szHint.width,
891 szHint.height));
892 return;
893} 738}
894 739
895/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
896/* 741/*
897 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
898 * Called after a window size change. 743 * Called after a window size change.
899 */ 744 */
900void 745void
901rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
902{ 747{
903 if (pty.pty < 0) 748 if (pty->pty < 0)
904 return; 749 return;
905 750
906 struct winsize ws; 751 struct winsize ws;
907 752
908 ws.ws_col = ncol; 753 ws.ws_col = ncol;
909 ws.ws_row = nrow; 754 ws.ws_row = nrow;
910 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
911 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
912 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
913 758
914#if 0 759#if 0
915 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
916 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
917 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
997 return true; 842 return true;
998} 843}
999 844
1000void 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)
1001{ 846{
1002 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
1003 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
1004 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1005} 850}
1006 851
1007void 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)
1008{ 853{
1009 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
1010 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
1011 856
1012 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
1013 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1014 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
1015 860
1016 free (s); 861 free (s);
1017 free (ws); 862 free (ws);
… …
1070 } 915 }
1071 916
1072 if (!rXParseAllocColor (&xcol, color)) 917 if (!rXParseAllocColor (&xcol, color))
1073 return; 918 return;
1074 919
1075 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
1076 921
1077 /* 922 /*
1078 * 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,
1079 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1080 */ 925 */
… …
1083 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
1084 break; 929 break;
1085 if (i > Color_White) 930 if (i > Color_White)
1086 { 931 {
1087 /* 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]); */
1088 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1089 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
1090 } 935 }
1091# endif 936# endif
1092 937
1093 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
1094 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
1097 /* Cursor cursor; */ 942 /* Cursor cursor; */
1098done: 943done:
1099 944
1100#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1101 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1102 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]);
1103#endif 948#endif
1104 949
1105 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1106 951
1107 recolour_cursor (); 952 recolour_cursor ();
… …
1122 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1123 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1124 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1125 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1126 971
1127 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (xdisp, cmap, xcol, 2);
1128 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1129} 974}
1130 975
1131/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1132/* 977/*
1133 * 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
… …
1137{ 982{
1138 unsigned int i; 983 unsigned int i;
1139 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1140 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1141 986
1142 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1143 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1144 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1145 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1146 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1147 { 991 {
… …
1165/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1166 1010
1167int 1011int
1168rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1169{ 1013{
1170 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1171 { 1015 {
1172 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1173 return false; 1017 return false;
1174 } 1018 }
1175 1019
… …
1181 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1182void 1026void
1183rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1027rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1184{ 1028{
1185 int fix_screen; 1029 int fix_screen;
1186 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1187 dDisp; 1031 int old_height = szHint.height;
1188 1032
1189 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1190 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1191 1035
1192 if (!ignoreparent) 1036 if (!ignoreparent)
1193 { 1037 {
1194#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1195 /* 1039 /*
… …
1199 int x, y, x1, y1; 1043 int x, y, x1, y1;
1200 int dx, dy; 1044 int dx, dy;
1201 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1202 Window unused_cr; 1046 Window unused_cr;
1203 1047
1204 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1205 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1206 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1207 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1208 /* 1052 /*
1209 * if display->root isn't the parent window, a WM will probably have offset 1053 * if display->root isn't the parent window, a WM will probably have offset
1210 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1211 */ 1055 */
… …
1213 { 1057 {
1214 x -= x1; 1058 x -= x1;
1215 y -= y1; 1059 y -= y1;
1216 } 1060 }
1217 1061
1218 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1219 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1220 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1221 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1222 1066
1223 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1224 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1225 dx = 0; 1069 dx = 0;
… …
1228 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1229 dy = 0; 1073 dy = 0;
1230 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1231 dy /= 2; 1075 dy /= 2;
1232 1076
1233 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1234 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1235#else 1079#else
1236 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1237#endif 1081#endif
1238 } 1082 }
1239 1083
1240 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1241 1085
1242 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1243 { 1087 {
1244 if (scrollbar_visible ()) 1088 if (scrollBar.state)
1245 { 1089 {
1246 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1247 window_sb_x, 0, 1091 window_sb_x, 0,
1248 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1249 resize_scrollbar (); 1093 resize_scrollbar ();
1250 } 1094 }
1251 1095
1252 if (menubar_visible ())
1253 XMoveResizeWindow (disp, menuBar.win,
1254 window_vt_x, 0,
1255 width, menuBar_TotalHeight ());
1256
1257 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1258 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1259 width, height); 1098 width, height);
1260 1099
1261 scr_clear (); 1100 scr_clear ();
1262#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1263 resize_pixmap (); 1102 resize_pixmap ();
1264#endif 1103#endif
1265 } 1104 }
1266 1105
1267 if (fix_screen || old_height == 0) 1106 if (fix_screen || old_height == 0)
1268 {
1269 int curr_screen = -1;
1270 int old_ncol = prev_ncol;
1271
1272 /* scr_reset only works on the primary screen */
1273 if (old_height) /* this is not the first time through */
1274 {
1275 unsigned int ocol = ncol;
1276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1277 curr_screen = scr_change_screen (PRIMARY);
1278 ncol = ocol;
1279 }
1280
1281 scr_reset (); 1107 scr_reset ();
1282
1283 if (curr_screen >= 0) /* this is not the first time through */
1284 {
1285 scr_change_screen (curr_screen);
1286 selection_check (old_ncol != ncol ? 4 : 0);
1287 }
1288 }
1289
1290 old_width = szHint.width;
1291 old_height = szHint.height;
1292 1108
1293#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1294 if (pixmap) 1110 if (pixmap)
1295 scr_touch (false); 1111 scr_touch (false);
1296#endif 1112#endif
… …
1309{ 1125{
1310 XWindowAttributes wattr; 1126 XWindowAttributes wattr;
1311 1127
1312 if (newwidth == 0 || newheight == 0) 1128 if (newwidth == 0 || newheight == 0)
1313 { 1129 {
1314 XGetWindowAttributes (display->display, display->root, &wattr); 1130 XGetWindowAttributes (xdisp, display->root, &wattr);
1315 1131
1316 if (newwidth == 0) 1132 if (newwidth == 0)
1317 newwidth = wattr.width - szHint.base_width; 1133 newwidth = wattr.width - szHint.base_width;
1318 if (newheight == 0) 1134 if (newheight == 0)
1319 newheight = wattr.height - szHint.base_height; 1135 newheight = wattr.height - szHint.base_height;
… …
1381 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1197 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1382 1198
1383 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1199 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1384 *p = '\0'; 1200 *p = '\0';
1385 1201
1386 atom = XInternAtom (display->display, server, False); 1202 atom = XInternAtom (xdisp, server, False);
1387 win = XGetSelectionOwner (display->display, atom); 1203 win = XGetSelectionOwner (xdisp, atom);
1388 1204
1389 if (win != None) 1205 if (win != None)
1390 return True; 1206 return True;
1391 } 1207 }
1392 1208
… …
1399 XPoint nspot; 1215 XPoint nspot;
1400 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1401 1217
1402 if (!Input_Context 1218 if (!Input_Context
1403 || !focus 1219 || !focus
1404 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1405 return; 1221 return;
1406 1222
1407 im_set_position (nspot); 1223 im_set_position (nspot);
1408 1224
1409 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1428 input_method = 0; 1244 input_method = 0;
1429 } 1245 }
1430 1246
1431 Input_Context = 0; 1247 Input_Context = 0;
1432} 1248}
1249
1250#ifdef ENABLE_XIM_ONTHESPOT
1251
1252static void
1253xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1254{
1255 ((rxvt_term *)client_data)->make_current ();
1256 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1257}
1258
1259static void
1260xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1264}
1265
1266static void
1267xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1268{
1269 rxvt_term *term = (rxvt_term *)client_data;
1270 XIMText *text = call_data->text;
1271
1272 term->make_current ();
1273
1274 if (text)
1275 {
1276 void *str;
1277
1278 if (!text->encoding_is_wchar && text->string.multi_byte)
1279 {
1280 // of course, X makes it ugly again
1281 if (term->rs[Rs_imLocale])
1282 SET_LOCALE (term->rs[Rs_imLocale]);
1283
1284 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1285 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1286
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->locale);
1289 }
1290 else
1291 str = (void *)text->string.wide_char;
1292
1293 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1294 DT_INT, call_data->caret,
1295 DT_INT, call_data->chg_first,
1296 DT_INT, call_data->chg_length,
1297 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1298 DT_WCS_LEN, str, str ? (int)text->length : 0,
1299 DT_END));
1300 }
1301 else
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_END));
1307}
1308
1309#if 0
1310static void
1311xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1312{
1313 ((rxvt_term *)client_data)->make_current ();
1314 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1315 DT_INT, call_data->position,
1316 DT_INT, call_data->direction,
1317 DT_INT, call_data->style,
1318 DT_END));
1319}
1320#endif
1321
1322#endif
1433 1323
1434/* 1324/*
1435 * Try to open a XIM with the current modifiers, then see if we can 1325 * Try to open a XIM with the current modifiers, then see if we can
1436 * open a suitable preedit type 1326 * open a suitable preedit type
1437 */ 1327 */
… …
1444 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1445 unsigned long fg, bg; 1335 unsigned long fg, bg;
1446 const char *p; 1336 const char *p;
1447 char **s; 1337 char **s;
1448 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1342
1343 set_environ (envv);
1449 1344
1450 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1451 return false; 1346 return false;
1452 1347
1453 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1454 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1455 if (input_method == NULL) 1349 if (input_method == NULL)
1456 return false; 1350 return false;
1457 1351
1458 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1478 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1479 1373
1480 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1481 { 1375 {
1482 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1483 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1484 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1485 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1486 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1487 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1488 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1489 input_style = (XIMPreeditNone | XIMStatusNone); 1383 input_style = XIMPreeditNone | XIMStatusNone;
1384#ifdef ENABLE_XIM_ONTHESPOT
1385 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1386 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1387#endif
1388 else
1389 input_style = XIMPreeditNothing | XIMStatusNothing;
1490 1390
1491 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1492 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1493 { 1393 {
1494 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1532 "*", 1432 "*",
1533 fheight, 1433 fheight,
1534 fheight + 1, fheight - 1, 1434 fheight + 1, fheight - 1,
1535 fheight - 2, fheight + 2); 1435 fheight - 2, fheight + 2);
1536 1436
1537 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1437 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1538 &missing_charset_list, &missing_charset_count, &def_string); 1438 &missing_charset_list, &missing_charset_count, &def_string);
1539 1439
1540 if (missing_charset_list) 1440 if (missing_charset_list)
1541 XFreeStringList (missing_charset_list); 1441 XFreeStringList (missing_charset_list);
1542 1442
… …
1583 XNBackground, bg, 1483 XNBackground, bg,
1584 XNArea, &status_rect, 1484 XNArea, &status_rect,
1585 XNFontSet, fs, 1485 XNFontSet, fs,
1586 NULL); 1486 NULL);
1587 } 1487 }
1488#if ENABLE_XIM_ONTHESPOT
1489 else if (input_style & XIMPreeditCallbacks)
1490 {
1491 im_set_position (spot);
1492
1493 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1494 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1495 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1496# if 0
1497 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1498# endif
1499
1500 preedit_attr = XVaCreateNestedList (0,
1501 XNSpotLocation, &spot,
1502 XNPreeditStartCallback, &xcb[0],
1503 XNPreeditDoneCallback , &xcb[1],
1504 XNPreeditDrawCallback , &xcb[2],
1505# if 0
1506 XNPreeditCaretCallback, &xcb[3],
1507# endif
1508 NULL);
1509 }
1510#endif
1588 1511
1589 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1590 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1591 XNClientWindow, vt, 1514 XNClientWindow, vt,
1592 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1595 status_attr ? XNStatusAttributes : NULL, 1518 status_attr ? XNStatusAttributes : NULL,
1596 status_attr, NULL); 1519 status_attr, NULL);
1597 1520
1598 if (preedit_attr) XFree (preedit_attr); 1521 if (preedit_attr) XFree (preedit_attr);
1599 if (status_attr) XFree (status_attr); 1522 if (status_attr) XFree (status_attr);
1600 if (fs) XFreeFontSet (display->display, fs); 1523 if (fs) XFreeFontSet (xdisp, fs);
1601 1524
1602 if (Input_Context == NULL) 1525 if (Input_Context == NULL)
1603 { 1526 {
1604 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1605 im_destroy (); 1528 im_destroy ();
1606 return false; 1529 return false;
1607 } 1530 }
1608 1531
1532#if 0
1533 // unfortunately, only the focus window is used by XIM, hard to fix
1534 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1535 vt_select_input ();
1536#endif
1537
1609 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1610 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1611 1540
1612 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1613 return true; 1541 return true;
1614} 1542}
1615 1543
1616void 1544void
1617rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1619 int i; 1547 int i;
1620 const char *p; 1548 const char *p;
1621 char **s; 1549 char **s;
1622 char buf[IMBUFSIZ]; 1550 char buf[IMBUFSIZ];
1623 1551
1624 SET_R (this); 1552 make_current ();
1625 1553
1626 im_destroy (); 1554 im_destroy ();
1627 1555
1628 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1629 if (Input_Context) 1556 if (Input_Context)
1630 return; 1557 return;
1631 1558
1632#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1633 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1706 XFree (preedit_attr); 1633 XFree (preedit_attr);
1707 XFree (status_attr); 1634 XFree (status_attr);
1708} 1635}
1709#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1710 1637
1711/*----------------------------------------------------------------------*/
1712rxvt_t rxvt_current_term;
1713
1714/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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