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.158 by root, Tue Jan 3 23:40:58 2006 UTC vs.
Revision 1.207 by root, Wed Jan 25 21:09:21 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66bool 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 150#endif
148#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 153#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 156#endif
157#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
184 188
185 termlist.push_back (this); 189 termlist.push_back (this);
186 190
187#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 193#endif
193} 194}
194 195
195// 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.
196// for use before an emergency exit 197// for use before an emergency exit
197void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
198{ 199{
199 if (cmd_pid) 200 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
201 202
202#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 204}
208 205
209rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
210{ 207{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 209
215 emergency_cleanup (); 210 emergency_cleanup ();
216 211
217#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
221#endif 216#endif
222 delete fontset[0]; 217 delete fontset[0];
223 218
224 if (display) 219 if (display)
225 { 220 {
226 dDisp;
227
228 selection_clear (); 221 selection_clear ();
229 222
230#ifdef USE_XIM 223#ifdef USE_XIM
231 im_destroy (); 224 im_destroy ();
232#endif 225#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif
236#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
239#endif 229#endif
240#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
242#endif 232#endif
243#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
245 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
246 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
247 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
248 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
249 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
250 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
254#endif 244#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
259#endif 249#endif
260 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
261 251
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 252 delete drawable;
268 // destroy all windows 253 // destroy all windows
269 if (parent[0]) 254 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
271 } 258 }
272 259
273 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 261 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
278#endif 264#endif
279 265
… …
285 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
286 free (allocated [i]); 272 free (allocated [i]);
287 273
288 free (selection.text); 274 free (selection.text);
289 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
290 free (env_windowid);
291 free (env_display); 276 free (env_display);
292 free (env_term); 277 free (env_term);
293 free (env_colorfgbg);
294 free (locale); 278 free (locale);
295 free (v_buffer); 279 free (v_buffer);
296 free (incr_buf); 280 free (incr_buf);
297 281
298 delete envv; 282 delete envv;
… …
301#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
302 delete keyboard; 286 delete keyboard;
303#endif 287#endif
304} 288}
305 289
290// child has exited, usually destroys
306void 291void
307rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
308{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
309 cmd_pid = 0; 296 cmd_pid = 0;
310 297
311 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
312 destroy (); 299 destroy ();
313} 300}
… …
316rxvt_term::destroy () 303rxvt_term::destroy ()
317{ 304{
318 if (destroy_ev.active) 305 if (destroy_ev.active)
319 return; 306 return;
320 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
321#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
322 scr_overlay_off (); 311 scr_overlay_off ();
323#endif 312#endif
324 313
325 if (display) 314 if (display)
… …
327#if USE_XIM 316#if USE_XIM
328 im_ev.stop (display); 317 im_ev.stop (display);
329#endif 318#endif
330#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif 321#endif
336#if TRANSPARENT 322#if TRANSPARENT
337 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
338#endif 324#endif
339 incr_ev.stop (); 325 incr_ev.stop ();
… …
363} 349}
364 350
365void 351void
366rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
367{ 353{
368 SET_R (this); 354 make_current ();
369 355
370 delete this; 356 delete this;
371} 357}
372 358
373/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
461 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
462} 448}
463 449
464/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
465bool 451bool
466rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 453{
454 this->envv = envv;
455
468 SET_R (this); 456 SET_R (this);
469
470 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
471 459
472 if (!init_vars ()) 460 if (!init_vars ())
473 return false; 461 return false;
474 462
475 init_secondary (); 463 init_secondary ();
… …
478 466
479#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 468 keyboard->register_done ();
481#endif 469#endif
482 470
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 474#endif
490 475
491#if ENABLE_PERL 476 pty = ptytty::create ();
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
493 {
494 rxvt_perl.init ();
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
497#endif
498 477
499 create_windows (argc, argv); 478 create_windows (argc, argv);
500 479
501 dDisp;
502
503 init_xlocale (); 480 init_xlocale ();
504 481
505 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
506 483
507#if 0 484#if 0
508 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
509#endif 486#endif
510 487
511#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
512 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
514#endif 491#endif
515#if (MENUBAR_MAX)
516 if (menubar_visible ())
517 XMapWindow (disp, menuBar.win);
518#endif
519#ifdef TRANSPARENT 492#ifdef TRANSPARENT
520 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
521 { 494 {
522 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
523 check_our_parents (); 496 check_our_parents ();
524 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
525 } 498 }
526#endif 499#endif
527 500
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 set_colorfgbg (); 501 set_colorfgbg ();
532 502
533 init_command (cmd_argv); 503 init_command (cmd_argv);
534 504
535 free (cmd_argv); 505 free (cmd_argv);
536 506
507 if (pty->pty >= 0)
537 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
538 509
539 check_ev.start (); 510 check_ev.start ();
540 511
541 PERL_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
542 526
543 return true; 527 return true;
544} 528}
545 529
546static struct sig_handlers 530static struct sig_handlers
547{ 531{
548 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
549 533
550 void sig_chld (sig_watcher &w)
551 {
552 // we are being called for every SIGCHLD, find the corresponding term
553 int pid;
554
555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557 if (pid == (*t)->cmd_pid)
558 {
559 (*t)->child_exit ();
560 break;
561 }
562 }
563
564 /* 534 /*
565 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
566 */ 536 */
567 void 537 void
568 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
569 { 539 {
570#ifdef DEBUG_CMD
571 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
572#endif
573 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
574 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
575 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
576 } 543 }
577 544
578 sig_handlers () 545 sig_handlers ()
579 : sw_chld (this, &sig_handlers::sig_chld),
580 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
581 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
582 { 548 {
583 } 549 }
584} sig_handlers; 550} sig_handlers;
585 551
552char **rxvt_environ; // startup environment
553
586void 554void
587rxvt_init () 555rxvt_init ()
588{ 556{
589 /* 557 ptytty::init ();
590 * Save and then give up any super-user privileges 558
591 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
592 * We should only need to be root in these cases:
593 * 1. write utmp entries on some systems
594 * 2. chown tty on some systems
595 */
596 rxvt_privileges (SAVE);
597 rxvt_privileges (IGNORE);
598 560
599 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
600 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
601 563
602 sig_handlers.sw_chld.start (SIGCHLD);
603 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
604 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
605 566
606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
607 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
608 569
609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
611 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
573
574 XrmInitialize ();
612} 575}
613 576
614/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
615 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
616 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
634 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
635 598
636 return p; 599 return p;
637} 600}
638 601
639void * 602void *
640rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
641{ 604{
642 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
643 606
644 if (!p) 607 if (!p)
645 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
646 609
647 return p; 610 return p;
648} 611}
649
650/* ------------------------------------------------------------------------- *
651 * PRIVILEGED OPERATIONS *
652 * ------------------------------------------------------------------------- */
653/* take care of suid/sgid super-user (root) privileges */
654void
655rxvt_privileges (rxvt_privaction action)
656{
657#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
658 static uid_t euid;
659 static gid_t egid;
660#endif
661
662#if ! defined(__CYGWIN32__)
663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664 /* setreuid () is the poor man's setuid (), seteuid () */
665# define seteuid(a) setreuid(-1, (a))
666# define setegid(a) setregid(-1, (a))
667# define HAVE_SETEUID
668# endif
669# ifdef HAVE_SETEUID
670 switch (action)
671 {
672 case IGNORE:
673 /*
674 * change effective uid/gid - not real uid/gid - so we can switch
675 * back to root later, as required
676 */
677 seteuid (getuid ());
678 setegid (getgid ());
679 break;
680 case SAVE:
681 euid = geteuid ();
682 egid = getegid ();
683 break;
684 case RESTORE:
685 seteuid (euid);
686 setegid (egid);
687 break;
688 }
689# else
690 switch (action)
691 {
692 case IGNORE:
693 setuid (getuid ());
694 setgid (getgid ());
695 /* FALLTHROUGH */
696 case SAVE:
697 /* FALLTHROUGH */
698 case RESTORE:
699 break;
700 }
701# endif
702#endif
703}
704
705#ifdef UTMP_SUPPORT
706void
707rxvt_term::privileged_utmp (rxvt_privaction action)
708{
709 if (OPTION (Opt_utmpInhibit)
710 || !pty.name || !*pty.name)
711 return;
712
713 rxvt_privileges (RESTORE);
714
715 if (action == SAVE)
716 makeutent (pty.name, rs[Rs_display_name]);
717 else
718 cleanutent ();
719
720 rxvt_privileges (IGNORE);
721}
722#endif
723 612
724/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
725/* 614/*
726 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
727 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
728 */ 617 */
729void 618void
730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
731{ 620{
732 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
733 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
734 unsigned int w, h; 623 unsigned int w, h;
735 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
736 dDisp;
737
738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
739 ncol, nrow, szHint.width, szHint.height));
740 625
741 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
742 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
743 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
744 629
… …
799 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
800 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
801 686
802 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
803 688
804 sb_w = mb_h = 0; 689 sb_w = 0;
805 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
806 691
807 if (scrollbar_visible ()) 692 if (scrollBar.state)
808 { 693 {
809 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
810 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
811 if (!OPTION (Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
812 window_vt_x += sb_w; 697 window_vt_x += sb_w;
813 } 698 }
814 699
815 if (menubar_visible ())
816 {
817 mb_h = menuBar_TotalHeight ();
818 szHint.base_height += mb_h;
819 window_vt_y += mb_h;
820 }
821
822 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
823 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
824 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
825 szHint.min_height = szHint.base_height + szHint.height_inc; 703 szHint.min_height = szHint.base_height + szHint.height_inc;
826 704
… …
844 { 722 {
845 min_it (height, max_height); 723 min_it (height, max_height);
846 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
847 } 725 }
848 726
849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
850 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
851 729
852 if (recalc_x) 730 if (recalc_x)
853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
854 if (recalc_y) 733 if (recalc_y)
855 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
856 735
857 ncol = width / fwidth; 736 ncol = width / fwidth;
858 nrow = height / fheight; 737 nrow = height / fheight;
859 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
860 ncol, nrow, szHint.width,
861 szHint.height));
862 return;
863} 738}
864 739
865/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
866/* 741/*
867 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
868 * Called after a window size change. 743 * Called after a window size change.
869 */ 744 */
870void 745void
871rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
872{ 747{
873 if (pty.pty < 0) 748 if (pty->pty < 0)
874 return; 749 return;
875 750
876 struct winsize ws; 751 struct winsize ws;
877 752
878 ws.ws_col = ncol; 753 ws.ws_col = ncol;
879 ws.ws_row = nrow; 754 ws.ws_row = nrow;
880 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
881 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
883 758
884#if 0 759#if 0
885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
886 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
887 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
967 return true; 842 return true;
968} 843}
969 844
970void 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)
971{ 846{
972 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
973 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
974 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
975} 850}
976 851
977void 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)
978{ 853{
979 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
980 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
981 856
982 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
984 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
985 860
986 free (s); 861 free (s);
987 free (ws); 862 free (ws);
… …
1024 i = atoi (color); 899 i = atoi (color);
1025 900
1026 if (i >= 8 && i <= 15) 901 if (i >= 8 && i <= 15)
1027 { /* bright colors */ 902 { /* bright colors */
1028 i -= 8; 903 i -= 8;
1029# ifndef NO_BRIGHTCOLOR
1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031 SET_PIXCOLOR (idx); 905 SET_PIXCOLOR (idx);
1032 goto done; 906 goto done;
1033# endif
1034 } 907 }
1035 908
1036 if (i >= 0 && i <= 7) 909 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 910 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1042 } 915 }
1043 916
1044 if (!rXParseAllocColor (&xcol, color)) 917 if (!rXParseAllocColor (&xcol, color))
1045 return; 918 return;
1046 919
1047 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
1048 921
1049 /* 922 /*
1050 * 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,
1051 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1052 */ 925 */
… …
1055 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
1056 break; 929 break;
1057 if (i > Color_White) 930 if (i > Color_White)
1058 { 931 {
1059 /* 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]); */
1060 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1061 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
1062 } 935 }
1063# endif 936# endif
1064 937
1065 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
1066 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
1069 /* Cursor cursor; */ 942 /* Cursor cursor; */
1070done: 943done:
1071 944
1072#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1073 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1074 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]);
1075#endif 948#endif
1076 949
1077 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1078 951
1079 recolour_cursor (); 952 recolour_cursor ();
… …
1094 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1095 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1096 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1097 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1098 971
1099 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (xdisp, cmap, xcol, 2);
1100 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1101} 974}
1102 975
1103/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1104/* 977/*
1105 * 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
… …
1109{ 982{
1110 unsigned int i; 983 unsigned int i;
1111 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1112 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1113 986
1114 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1115 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1116 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1117 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1118 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1119 { 991 {
… …
1137/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1138 1010
1139int 1011int
1140rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1141{ 1013{
1142 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1143 { 1015 {
1144 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1145 return false; 1017 return false;
1146 } 1018 }
1147 1019
… …
1153 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1154void 1026void
1155rxvt_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)
1156{ 1028{
1157 int fix_screen; 1029 int fix_screen;
1158 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1159 dDisp; 1031 int old_height = szHint.height;
1160 1032
1161 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1162 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1163 1035
1164 if (!ignoreparent) 1036 if (!ignoreparent)
1165 { 1037 {
1166#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1167 /* 1039 /*
… …
1171 int x, y, x1, y1; 1043 int x, y, x1, y1;
1172 int dx, dy; 1044 int dx, dy;
1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1174 Window unused_cr; 1046 Window unused_cr;
1175 1047
1176 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1177 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1180 /* 1052 /*
1181 * 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
1182 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1183 */ 1055 */
… …
1185 { 1057 {
1186 x -= x1; 1058 x -= x1;
1187 y -= y1; 1059 y -= y1;
1188 } 1060 }
1189 1061
1190 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1191 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1192 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1193 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1194 1066
1195 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1196 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1197 dx = 0; 1069 dx = 0;
… …
1200 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1201 dy = 0; 1073 dy = 0;
1202 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1203 dy /= 2; 1075 dy /= 2;
1204 1076
1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1206 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1207#else 1079#else
1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1209#endif 1081#endif
1210 } 1082 }
1211 1083
1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1213 1085
1214 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1215 { 1087 {
1216 if (scrollbar_visible ()) 1088 if (scrollBar.state)
1217 { 1089 {
1218 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1219 window_sb_x, 0, 1091 window_sb_x, 0,
1220 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1221 resize_scrollbar (); 1093 resize_scrollbar ();
1222 } 1094 }
1223 1095
1224 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0,
1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1228
1229 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1230 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1231 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1098 width, height);
1232 1099
1233 scr_clear (); 1100 scr_clear ();
1234#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1102 resize_pixmap ();
1236#endif 1103#endif
1237 } 1104 }
1238 1105
1239 if (fix_screen || old_height == 0) 1106 if (fix_screen || old_height == 0)
1240 {
1241 int curr_screen = -1;
1242 int old_ncol = prev_ncol;
1243
1244 /* scr_reset only works on the primary screen */
1245 if (old_height) /* this is not the first time through */
1246 {
1247 unsigned int ocol = ncol;
1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249 curr_screen = scr_change_screen (PRIMARY);
1250 ncol = ocol;
1251 }
1252
1253 scr_reset (); 1107 scr_reset ();
1254
1255 if (curr_screen >= 0) /* this is not the first time through */
1256 {
1257 scr_change_screen (curr_screen);
1258 selection_check (old_ncol != ncol ? 4 : 0);
1259 }
1260 }
1261
1262 old_width = szHint.width;
1263 old_height = szHint.height;
1264 1108
1265#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1266 if (pixmap) 1110 if (pixmap)
1267 scr_touch (false); 1111 scr_touch (false);
1268#endif 1112#endif
… …
1281{ 1125{
1282 XWindowAttributes wattr; 1126 XWindowAttributes wattr;
1283 1127
1284 if (newwidth == 0 || newheight == 0) 1128 if (newwidth == 0 || newheight == 0)
1285 { 1129 {
1286 XGetWindowAttributes (display->display, display->root, &wattr); 1130 XGetWindowAttributes (xdisp, display->root, &wattr);
1287 1131
1288 if (newwidth == 0) 1132 if (newwidth == 0)
1289 newwidth = wattr.width - szHint.base_width; 1133 newwidth = wattr.width - szHint.base_width;
1290 if (newheight == 0) 1134 if (newheight == 0)
1291 newheight = wattr.height - szHint.base_height; 1135 newheight = wattr.height - szHint.base_height;
… …
1353 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1197 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354 1198
1355 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1199 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1356 *p = '\0'; 1200 *p = '\0';
1357 1201
1358 atom = XInternAtom (display->display, server, False); 1202 atom = XInternAtom (xdisp, server, False);
1359 win = XGetSelectionOwner (display->display, atom); 1203 win = XGetSelectionOwner (xdisp, atom);
1360 1204
1361 if (win != None) 1205 if (win != None)
1362 return True; 1206 return True;
1363 } 1207 }
1364 1208
… …
1371 XPoint nspot; 1215 XPoint nspot;
1372 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1373 1217
1374 if (!Input_Context 1218 if (!Input_Context
1375 || !focus 1219 || !focus
1376 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1377 return; 1221 return;
1378 1222
1379 im_set_position (nspot); 1223 im_set_position (nspot);
1380 1224
1381 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1400 input_method = 0; 1244 input_method = 0;
1401 } 1245 }
1402 1246
1403 Input_Context = 0; 1247 Input_Context = 0;
1404} 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
1405 1323
1406/* 1324/*
1407 * 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
1408 * open a suitable preedit type 1326 * open a suitable preedit type
1409 */ 1327 */
… …
1416 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1335 unsigned long fg, bg;
1418 const char *p; 1336 const char *p;
1419 char **s; 1337 char **s;
1420 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1342
1343 set_environ (envv);
1421 1344
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1346 return false;
1424 1347
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1427 if (input_method == NULL) 1349 if (input_method == NULL)
1428 return false; 1350 return false;
1429 1351
1430 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1450 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1451 1373
1452 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1453 { 1375 {
1454 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1455 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1456 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1457 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1458 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1459 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1461 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;
1462 1390
1463 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1464 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1465 { 1393 {
1466 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1504 "*", 1432 "*",
1505 fheight, 1433 fheight,
1506 fheight + 1, fheight - 1, 1434 fheight + 1, fheight - 1,
1507 fheight - 2, fheight + 2); 1435 fheight - 2, fheight + 2);
1508 1436
1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1437 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1510 &missing_charset_list, &missing_charset_count, &def_string); 1438 &missing_charset_list, &missing_charset_count, &def_string);
1511 1439
1512 if (missing_charset_list) 1440 if (missing_charset_list)
1513 XFreeStringList (missing_charset_list); 1441 XFreeStringList (missing_charset_list);
1514 1442
… …
1555 XNBackground, bg, 1483 XNBackground, bg,
1556 XNArea, &status_rect, 1484 XNArea, &status_rect,
1557 XNFontSet, fs, 1485 XNFontSet, fs,
1558 NULL); 1486 NULL);
1559 } 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
1560 1511
1561 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1562 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1563 XNClientWindow, vt, 1514 XNClientWindow, vt,
1564 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1567 status_attr ? XNStatusAttributes : NULL, 1518 status_attr ? XNStatusAttributes : NULL,
1568 status_attr, NULL); 1519 status_attr, NULL);
1569 1520
1570 if (preedit_attr) XFree (preedit_attr); 1521 if (preedit_attr) XFree (preedit_attr);
1571 if (status_attr) XFree (status_attr); 1522 if (status_attr) XFree (status_attr);
1572 if (fs) XFreeFontSet (display->display, fs); 1523 if (fs) XFreeFontSet (xdisp, fs);
1573 1524
1574 if (Input_Context == NULL) 1525 if (Input_Context == NULL)
1575 { 1526 {
1576 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577 im_destroy (); 1528 im_destroy ();
1578 return false; 1529 return false;
1579 } 1530 }
1580 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
1581 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1582 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1583 1540
1584 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585 return true; 1541 return true;
1586} 1542}
1587 1543
1588void 1544void
1589rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1591 int i; 1547 int i;
1592 const char *p; 1548 const char *p;
1593 char **s; 1549 char **s;
1594 char buf[IMBUFSIZ]; 1550 char buf[IMBUFSIZ];
1595 1551
1596 SET_R (this); 1552 make_current ();
1597 1553
1598 im_destroy (); 1554 im_destroy ();
1599 1555
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1556 if (Input_Context)
1602 return; 1557 return;
1603 1558
1604#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1605 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1678 XFree (preedit_attr); 1633 XFree (preedit_attr);
1679 XFree (status_attr); 1634 XFree (status_attr);
1680} 1635}
1681#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1682 1637
1683/*----------------------------------------------------------------------*/
1684rxvt_t rxvt_current_term;
1685
1686/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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