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.166 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.206 by root, Wed Jan 25 21:03:04 2006 UTC

… …
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 HOOK_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#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif
282 265
283 displays.put (display); 266 displays.put (display);
284 267
285 scr_release (); 268 scr_release ();
286 269
… …
288 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 272 free (allocated [i]);
290 273
291 free (selection.text); 274 free (selection.text);
292 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 276 free (env_display);
295 free (env_term); 277 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 278 free (locale);
298 free (v_buffer); 279 free (v_buffer);
299 free (incr_buf); 280 free (incr_buf);
300 281
301 delete envv; 282 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
305 delete keyboard; 286 delete keyboard;
306#endif 287#endif
307} 288}
308 289
290// child has exited, usually destroys
309void 291void
310rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
311{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
312 cmd_pid = 0; 296 cmd_pid = 0;
313 297
314 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
315 destroy (); 299 destroy ();
316} 300}
… …
319rxvt_term::destroy () 303rxvt_term::destroy ()
320{ 304{
321 if (destroy_ev.active) 305 if (destroy_ev.active)
322 return; 306 return;
323 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
324#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
325 scr_overlay_off (); 311 scr_overlay_off ();
326#endif 312#endif
327 313
328 if (display) 314 if (display)
… …
330#if USE_XIM 316#if USE_XIM
331 im_ev.stop (display); 317 im_ev.stop (display);
332#endif 318#endif
333#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
335#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif 321#endif
339#if TRANSPARENT 322#if TRANSPARENT
340 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
341#endif 324#endif
342 incr_ev.stop (); 325 incr_ev.stop ();
… …
366} 349}
367 350
368void 351void
369rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
370{ 353{
371 SET_R (this); 354 make_current ();
372 355
373 delete this; 356 delete this;
374} 357}
375 358
376/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
464 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
465} 448}
466 449
467/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
468bool 451bool
469rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{ 453{
454 this->envv = envv;
455
471 SET_R (this); 456 SET_R (this);
472
473 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
474 459
475 if (!init_vars ()) 460 if (!init_vars ())
476 return false; 461 return false;
477 462
478 init_secondary (); 463 init_secondary ();
… …
481 466
482#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 468 keyboard->register_done ();
484#endif 469#endif
485 470
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 474#endif
493 475
494#if ENABLE_PERL 476 pty = ptytty::create ();
495 if (!rs[Rs_perl_ext_1])
496 rs[Rs_perl_ext_1] = "default";
497
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 {
502 rxvt_perl.init ();
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 }
505#endif
506 477
507 create_windows (argc, argv); 478 create_windows (argc, argv);
508 479
509 dDisp;
510
511 init_xlocale (); 480 init_xlocale ();
512 481
513 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
514 483
515#if 0 484#if 0
516 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
517#endif 486#endif
518 487
519#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
522#endif 491#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 492#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
529 { 494 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
531 check_our_parents (); 496 check_our_parents ();
532 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
533 } 498 }
534#endif 499#endif
535 500
536 XMapWindow (disp, vt);
537 XMapWindow (disp, parent[0]);
538
539 set_colorfgbg (); 501 set_colorfgbg ();
540 502
541 init_command (cmd_argv); 503 init_command (cmd_argv);
542 504
543 free (cmd_argv); 505 free (cmd_argv);
544 506
545 if (pty.pty >= 0) 507 if (pty->pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
547 509
548 check_ev.start (); 510 check_ev.start ();
549 511
550 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
551 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (display->display, 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
552 return true; 527 return true;
553} 528}
554 529
555static struct sig_handlers 530static struct sig_handlers
556{ 531{
557 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
558 533
559 void sig_chld (sig_watcher &w)
560 {
561 // we are being called for every SIGCHLD, find the corresponding term
562 int pid;
563
564 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
565 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
566 if (pid == (*t)->cmd_pid)
567 {
568 (*t)->child_exit ();
569 break;
570 }
571 }
572
573 /* 534 /*
574 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
575 */ 536 */
576 void 537 void
577 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
578 { 539 {
579#ifdef DEBUG_CMD
580 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
581#endif
582 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
583 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
584 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
585 } 543 }
586 544
587 sig_handlers () 545 sig_handlers ()
588 : sw_chld (this, &sig_handlers::sig_chld),
589 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
590 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
591 { 548 {
592 } 549 }
593} sig_handlers; 550} sig_handlers;
594 551
552char **rxvt_environ; // startup environment
553
595void 554void
596rxvt_init () 555rxvt_init ()
597{ 556{
598 /* 557 ptytty::init ();
599 * Save and then give up any super-user privileges 558
600 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
601 * We should only need to be root in these cases:
602 * 1. write utmp entries on some systems
603 * 2. chown tty on some systems
604 */
605 rxvt_privileges (SAVE);
606 rxvt_privileges (IGNORE);
607 560
608 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
609 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
610 563
611 sig_handlers.sw_chld.start (SIGCHLD);
612 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
613 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
614 566
615 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
616 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
617 569
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
621 573
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 574 XrmInitialize ();
624#endif
625} 575}
626 576
627/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
647 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
648 598
649 return p; 599 return p;
650} 600}
651 601
652void * 602void *
653rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
654{ 604{
655 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
656 606
657 if (!p) 607 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
659 609
660 return p; 610 return p;
661} 611}
662
663/* ------------------------------------------------------------------------- *
664 * PRIVILEGED OPERATIONS *
665 * ------------------------------------------------------------------------- */
666/* take care of suid/sgid super-user (root) privileges */
667void
668rxvt_privileges (rxvt_privaction action)
669{
670#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
671 static uid_t euid;
672 static gid_t egid;
673#endif
674
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 seteuid (getuid ());
691 setegid (getgid ());
692 break;
693 case SAVE:
694 euid = geteuid ();
695 egid = getegid ();
696 break;
697 case RESTORE:
698 seteuid (euid);
699 setegid (egid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setuid (getuid ());
707 setgid (getgid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736 612
737/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
738/* 614/*
739 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
741 */ 617 */
742void 618void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 620{
745 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
747 unsigned int w, h; 623 unsigned int w, h;
748 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
749 dDisp;
750
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752 ncol, nrow, szHint.width, szHint.height));
753 625
754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
755 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757 629
… …
812 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
814 686
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 688
817 sb_w = mb_h = 0; 689 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
819 691
820 if (scrollbar_visible ()) 692 if (scrollBar.state)
821 { 693 {
822 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
824 if (!OPTION (Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 697 window_vt_x += sb_w;
826 } 698 }
827 699
828 if (menubar_visible ())
829 {
830 mb_h = menuBar_TotalHeight ();
831 szHint.base_height += mb_h;
832 window_vt_y += mb_h;
833 }
834
835 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
838 szHint.min_height = szHint.base_height + szHint.height_inc; 703 szHint.min_height = szHint.base_height + szHint.height_inc;
839 704
… …
857 { 722 {
858 min_it (height, max_height); 723 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
860 } 725 }
861 726
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
864 729
865 if (recalc_x) 730 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
867 if (recalc_y) 733 if (recalc_y)
868 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
869 735
870 ncol = width / fwidth; 736 ncol = width / fwidth;
871 nrow = height / fheight; 737 nrow = height / fheight;
872 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
873 ncol, nrow, szHint.width,
874 szHint.height));
875 return;
876} 738}
877 739
878/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
879/* 741/*
880 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
881 * Called after a window size change. 743 * Called after a window size change.
882 */ 744 */
883void 745void
884rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
885{ 747{
886 if (pty.pty < 0) 748 if (pty->pty < 0)
887 return; 749 return;
888 750
889 struct winsize ws; 751 struct winsize ws;
890 752
891 ws.ws_col = ncol; 753 ws.ws_col = ncol;
892 ws.ws_row = nrow; 754 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 758
897#if 0 759#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
1080 /* Cursor cursor; */ 942 /* Cursor cursor; */
1081done: 943done:
1082 944
1083#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1084 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1085 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]);
1086#endif 948#endif
1087 949
1088 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1089 951
1090 recolour_cursor (); 952 recolour_cursor ();
… …
1105 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1106 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1107 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1108 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1109 971
1110 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
1111 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1112} 974}
1113 975
1114/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1115/* 977/*
… …
1120{ 982{
1121 unsigned int i; 983 unsigned int i;
1122 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1123 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1124 986
1125 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1126 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1127 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1128 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1129 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1130 { 991 {
… …
1148/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1149 1010
1150int 1011int
1151rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1152{ 1013{
1153 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1154 { 1015 {
1155 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1156 return false; 1017 return false;
1157 } 1018 }
1158 1019
… …
1164 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1165void 1026void
1166rxvt_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)
1167{ 1028{
1168 int fix_screen; 1029 int fix_screen;
1169 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1170 dDisp; 1031 int old_height = szHint.height;
1171 1032
1172 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1173 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1174 1035
1175 if (!ignoreparent) 1036 if (!ignoreparent)
1176 { 1037 {
1177#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1178 /* 1039 /*
… …
1182 int x, y, x1, y1; 1043 int x, y, x1, y1;
1183 int dx, dy; 1044 int dx, dy;
1184 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1185 Window unused_cr; 1046 Window unused_cr;
1186 1047
1187 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1188 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1189 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1190 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1191 /* 1052 /*
1192 * 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
1193 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1194 */ 1055 */
… …
1196 { 1057 {
1197 x -= x1; 1058 x -= x1;
1198 y -= y1; 1059 y -= y1;
1199 } 1060 }
1200 1061
1201 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1202 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1203 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1204 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1205 1066
1206 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1207 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1208 dx = 0; 1069 dx = 0;
… …
1211 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1212 dy = 0; 1073 dy = 0;
1213 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1214 dy /= 2; 1075 dy /= 2;
1215 1076
1216 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1217 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1218#else 1079#else
1219 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1220#endif 1081#endif
1221 } 1082 }
1222 1083
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1085
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1087 {
1227 if (scrollbar_visible ()) 1088 if (scrollBar.state)
1228 { 1089 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1230 window_sb_x, 0, 1091 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1093 resize_scrollbar ();
1233 } 1094 }
1234 1095
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239
1240 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1241 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1242 width, height); 1098 width, height);
1243 1099
1244 scr_clear (); 1100 scr_clear ();
1245#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1246 resize_pixmap (); 1102 resize_pixmap ();
1247#endif 1103#endif
1248 } 1104 }
1249 1105
1250 if (fix_screen || old_height == 0) 1106 if (fix_screen || old_height == 0)
1251 {
1252 int curr_screen = -1;
1253 int old_ncol = prev_ncol;
1254
1255 /* scr_reset only works on the primary screen */
1256 if (old_height) /* this is not the first time through */
1257 {
1258 unsigned int ocol = ncol;
1259 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1260 curr_screen = scr_change_screen (PRIMARY);
1261 ncol = ocol;
1262 }
1263
1264 scr_reset (); 1107 scr_reset ();
1265
1266 if (curr_screen >= 0) /* this is not the first time through */
1267 {
1268 scr_change_screen (curr_screen);
1269 selection_check (old_ncol != ncol ? 4 : 0);
1270 }
1271 }
1272
1273 old_width = szHint.width;
1274 old_height = szHint.height;
1275 1108
1276#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1277 if (pixmap) 1110 if (pixmap)
1278 scr_touch (false); 1111 scr_touch (false);
1279#endif 1112#endif
… …
1382 XPoint nspot; 1215 XPoint nspot;
1383 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1384 1217
1385 if (!Input_Context 1218 if (!Input_Context
1386 || !focus 1219 || !focus
1387 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1388 return; 1221 return;
1389 1222
1390 im_set_position (nspot); 1223 im_set_position (nspot);
1391 1224
1392 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1411 input_method = 0; 1244 input_method = 0;
1412 } 1245 }
1413 1246
1414 Input_Context = 0; 1247 Input_Context = 0;
1415} 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
1416 1323
1417/* 1324/*
1418 * 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
1419 * open a suitable preedit type 1326 * open a suitable preedit type
1420 */ 1327 */
… …
1427 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1335 unsigned long fg, bg;
1429 const char *p; 1336 const char *p;
1430 char **s; 1337 char **s;
1431 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1342
1343 set_environ (envv);
1432 1344
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1346 return false;
1435 1347
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1437 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1438 if (input_method == NULL) 1349 if (input_method == NULL)
1439 return false; 1350 return false;
1440 1351
1441 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1461 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1462 1373
1463 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1464 { 1375 {
1465 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1466 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1467 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1468 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1469 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1470 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1471 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1472 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;
1473 1390
1474 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1475 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1476 { 1393 {
1477 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1566 XNBackground, bg, 1483 XNBackground, bg,
1567 XNArea, &status_rect, 1484 XNArea, &status_rect,
1568 XNFontSet, fs, 1485 XNFontSet, fs,
1569 NULL); 1486 NULL);
1570 } 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
1571 1511
1572 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1573 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1574 XNClientWindow, vt, 1514 XNClientWindow, vt,
1575 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1587 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1588 im_destroy (); 1528 im_destroy ();
1589 return false; 1529 return false;
1590 } 1530 }
1591 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
1592 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1593 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1594 1540
1595 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1596 return true; 1541 return true;
1597} 1542}
1598 1543
1599void 1544void
1600rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1602 int i; 1547 int i;
1603 const char *p; 1548 const char *p;
1604 char **s; 1549 char **s;
1605 char buf[IMBUFSIZ]; 1550 char buf[IMBUFSIZ];
1606 1551
1607 SET_R (this); 1552 make_current ();
1608 1553
1609 im_destroy (); 1554 im_destroy ();
1610 1555
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1556 if (Input_Context)
1613 return; 1557 return;
1614 1558
1615#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1616 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1689 XFree (preedit_attr); 1633 XFree (preedit_attr);
1690 XFree (status_attr); 1634 XFree (status_attr);
1691} 1635}
1692#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1693 1637
1694/*----------------------------------------------------------------------*/
1695rxvt_t rxvt_current_term;
1696
1697/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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