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.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.206 by root, Wed Jan 25 21:03:04 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
55static char curlocale[128]; 56static char curlocale[128], savelocale[128];
56 57
57bool 58bool
58rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
59{ 60{
60 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 62 return false;
62 63
63 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
65 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
66} 80}
67 81
68#if ENABLE_COMBINING 82#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
70 84
… …
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
136#endif 150#endif
137#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif 153#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif
143#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 156#endif
146#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
147 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
159 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
160#endif 171#endif
161#ifdef USE_XIM 172#ifdef USE_XIM
162 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
163#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
164 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
165 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
166 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
167 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
168 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
169 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
170 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
173 188
174 termlist.push_back (this); 189 termlist.push_back (this);
175 190
176#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
177 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
178
179 if (!keyboard)
180 rxvt_fatal ("out of memory, aborting.\n");
181#endif 193#endif
182} 194}
183 195
184// 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.
185// for use before an emergency exit 197// for use before an emergency exit
186void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
187{ 199{
188 if (cmd_pid) 200 if (cmd_pid)
189 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
190 202
191#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
192 privileged_utmp (RESTORE);
193#endif
194
195 pty.put ();
196} 204}
197 205
198rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
199{ 207{
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
208#endif 216#endif
209 delete fontset[0]; 217 delete fontset[0];
210 218
211 if (display) 219 if (display)
212 { 220 {
213 dDisp;
214
215 selection_clear (); 221 selection_clear ();
216 222
217#ifdef USE_XIM 223#ifdef USE_XIM
218 im_destroy (); 224 im_destroy ();
219#endif 225#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif
223#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
226#endif 229#endif
227#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
229#endif 232#endif
230#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
231 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
232 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
233 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
234 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
235 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
236 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
237 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
241#endif 244#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
246#endif 249#endif
247 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
248 251
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 261 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
265#endif 264#endif
266 265
… …
272 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 272 free (allocated [i]);
274 273
275 free (selection.text); 274 free (selection.text);
276 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 276 free (env_display);
279 free (env_term); 277 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 278 free (locale);
282 free (v_buffer); 279 free (v_buffer);
283 free (incr_buf); 280 free (incr_buf);
284 281
285 delete envv; 282 delete envv;
… …
288#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
289 delete keyboard; 286 delete keyboard;
290#endif 287#endif
291} 288}
292 289
290// child has exited, usually destroys
291void
292rxvt_term::child_cb (child_watcher &w, int status)
293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
296 cmd_pid = 0;
297
298 if (!OPTION (Opt_hold))
299 destroy ();
300}
301
293void 302void
294rxvt_term::destroy () 303rxvt_term::destroy ()
295{ 304{
296 if (destroy_ev.active) 305 if (destroy_ev.active)
297 return; 306 return;
298 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
299#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
300 scr_overlay_off (); 311 scr_overlay_off ();
301#endif 312#endif
302 313
303 if (display) 314 if (display)
… …
305#if USE_XIM 316#if USE_XIM
306 im_ev.stop (display); 317 im_ev.stop (display);
307#endif 318#endif
308#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
309 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
310#endif
311#if MENUBAR
312 menubar_ev.stop (display);
313#endif 321#endif
314#if TRANSPARENT 322#if TRANSPARENT
315 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
316#endif 324#endif
317 incr_ev.stop (); 325 incr_ev.stop ();
… …
341} 349}
342 350
343void 351void
344rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
345{ 353{
346 SET_R (this); 354 make_current ();
347 355
348 delete this; 356 delete this;
349} 357}
350 358
351/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
439 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
440} 448}
441 449
442/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
443bool 451bool
444rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
445{ 453{
454 this->envv = envv;
455
446 SET_R (this); 456 SET_R (this);
447
448 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
449 459
450 if (!init_vars ()) 460 if (!init_vars ())
451 return false; 461 return false;
452 462
453 init_secondary (); 463 init_secondary ();
… …
456 466
457#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
458 keyboard->register_done (); 468 keyboard->register_done ();
459#endif 469#endif
460 470
461#if MENUBAR_MAX
462 menubar_read (rs[Rs_menu]);
463#endif
464#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
465 if (options & Opt_scrollBar) 472 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 474#endif
468 475
476 pty = ptytty::create ();
477
469 create_windows (argc, argv); 478 create_windows (argc, argv);
470 479
471 dDisp;
472
473 init_xlocale (); 480 init_xlocale ();
474 481
475 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
476 483
477#if 0 484#if 0
478 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
479#endif 486#endif
480 487
481#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 489 if (OPTION (Opt_scrollBar))
483 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
484#endif 491#endif
485#if (MENUBAR_MAX)
486 if (menubar_visible ())
487 XMapWindow (disp, menuBar.win);
488#endif
489#ifdef TRANSPARENT 492#ifdef TRANSPARENT
490 if (options & Opt_transparent) 493 if (OPTION (Opt_transparent))
491 { 494 {
492 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
493 check_our_parents (); 496 check_our_parents ();
494 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
495 } 498 }
496#endif 499#endif
497 500
498 XMapWindow (disp, vt);
499 XMapWindow (disp, parent[0]);
500
501 set_colorfgbg (); 501 set_colorfgbg ();
502 502
503 init_command (cmd_argv); 503 init_command (cmd_argv);
504 504
505 free (cmd_argv); 505 free (cmd_argv);
506 506
507 if (pty->pty >= 0)
507 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
508 509
509 check_ev.start (); 510 check_ev.start ();
510 511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (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
511 return true; 527 return true;
512} 528}
513 529
514static struct sig_handlers 530static struct sig_handlers
515{ 531{
516 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
517 533
518 void sig_chld (sig_watcher &w)
519 {
520 // we are being called for every SIGCHLD, find the corresponding term
521 int pid;
522
523 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525 if (pid == (*t)->cmd_pid)
526 {
527 (*t)->destroy ();
528 break;
529 }
530 }
531
532 /* 534 /*
533 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
534 */ 536 */
535 void 537 void
536 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
537 { 539 {
538#ifdef DEBUG_CMD
539 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
540#endif
541 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
542 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
543 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
544 } 543 }
545 544
546 sig_handlers () 545 sig_handlers ()
547 : sw_chld (this, &sig_handlers::sig_chld),
548 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
550 { 548 {
551 } 549 }
552} sig_handlers; 550} sig_handlers;
553 551
552char **rxvt_environ; // startup environment
553
554void 554void
555rxvt_init () 555rxvt_init ()
556{ 556{
557 /* 557 ptytty::init ();
558 * Save and then give up any super-user privileges 558
559 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
560 * We should only need to be root in these cases:
561 * 1. write utmp entries on some systems
562 * 2. chown tty on some systems
563 */
564 rxvt_privileges (SAVE);
565 rxvt_privileges (IGNORE);
566 560
567 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
568 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
569 563
570 sig_handlers.sw_chld.start (SIGCHLD);
571 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
572 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
573 566
574 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
575 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
576 569
577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
579 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
573
574 XrmInitialize ();
580} 575}
581 576
582/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
583 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
584 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
602 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
603 598
604 return p; 599 return p;
605} 600}
606 601
607void * 602void *
608rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
609{ 604{
610 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
611 606
612 if (!p) 607 if (!p)
613 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
614 609
615 return p; 610 return p;
616} 611}
617
618/* ------------------------------------------------------------------------- *
619 * PRIVILEGED OPERATIONS *
620 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */
622void
623rxvt_privileges (rxvt_privaction action)
624{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a))
635# define HAVE_SETEUID
636# endif
637# ifdef HAVE_SETEUID
638 switch (action)
639 {
640 case IGNORE:
641 /*
642 * change effective uid/gid - not real uid/gid - so we can switch
643 * back to root later, as required
644 */
645 seteuid (getuid ());
646 setegid (getgid ());
647 break;
648 case SAVE:
649 euid = geteuid ();
650 egid = getegid ();
651 break;
652 case RESTORE:
653 seteuid (euid);
654 setegid (egid);
655 break;
656 }
657# else
658 switch (action)
659 {
660 case IGNORE:
661 setuid (getuid ());
662 setgid (getgid ());
663 /* FALLTHROUGH */
664 case SAVE:
665 /* FALLTHROUGH */
666 case RESTORE:
667 break;
668 }
669# endif
670#endif
671}
672
673#ifdef UTMP_SUPPORT
674void
675rxvt_term::privileged_utmp (rxvt_privaction action)
676{
677 if ((options & Opt_utmpInhibit)
678 || !pty.name || !*pty.name)
679 return;
680
681 rxvt_privileges (RESTORE);
682
683 if (action == SAVE)
684 makeutent (pty.name, rs[Rs_display_name]);
685 else
686 cleanutent ();
687
688 rxvt_privileges (IGNORE);
689}
690#endif
691 612
692/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
693/* 614/*
694 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
696 */ 617 */
697void 618void
698rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 620{
700 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
702 unsigned int w, h; 623 unsigned int w, h;
703 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
704 dDisp;
705
706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
707 ncol, nrow, szHint.width, szHint.height));
708 625
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 629
… …
767 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
768 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
769 686
770 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
771 688
772 sb_w = mb_h = 0; 689 sb_w = 0;
773 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
774 691
775 if (scrollbar_visible ()) 692 if (scrollBar.state)
776 { 693 {
777 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
778 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
779 if (!(options & Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
780 window_vt_x += sb_w; 697 window_vt_x += sb_w;
781 }
782
783 if (menubar_visible ())
784 {
785 mb_h = menuBar_TotalHeight ();
786 szHint.base_height += mb_h;
787 window_vt_y += mb_h;
788 } 698 }
789 699
790 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
791 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
792 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
812 { 722 {
813 min_it (height, max_height); 723 min_it (height, max_height);
814 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
815 } 725 }
816 726
817 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
818 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
819 729
820 if (recalc_x) 730 if (recalc_x)
821 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
822 if (recalc_y) 733 if (recalc_y)
823 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
824 735
825 ncol = width / fwidth; 736 ncol = width / fwidth;
826 nrow = height / fheight; 737 nrow = height / fheight;
827 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
828 ncol, nrow, szHint.width,
829 szHint.height));
830 return;
831} 738}
832 739
833/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
834/* 741/*
835 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
836 * Called after a window size change. 743 * Called after a window size change.
837 */ 744 */
838void 745void
839rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
840{ 747{
841 if (pty.pty < 0) 748 if (pty->pty < 0)
842 return; 749 return;
843 750
844 struct winsize ws; 751 struct winsize ws;
845 752
846 ws.ws_col = ncol; 753 ws.ws_col = ncol;
847 ws.ws_row = nrow; 754 ws.ws_row = nrow;
848 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
849 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
850 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
851 758
852#if 0 759#if 0
853 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
854 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
855 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
891 prop.height += lineSpace; 798 prop.height += lineSpace;
892 fs->set_prop (prop); 799 fs->set_prop (prop);
893 800
894 fwidth = prop.width; 801 fwidth = prop.width;
895 fheight = prop.height; 802 fheight = prop.height;
896 fbase = (*fs)[1]->ascent; 803 fbase = prop.ascent;
897 804
898 for (int style = 1; style < 4; style++) 805 for (int style = 1; style < 4; style++)
899 { 806 {
900#if ENABLE_STYLES 807#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 808 const char *res = rs[Rs_font + style];
… …
935 return true; 842 return true;
936} 843}
937 844
938void 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)
939{ 846{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 847 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 850}
945 851
946void 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)
947{ 853{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
951 856
952 XChangeProperty (display->display, parent[0], 857 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 899 i = atoi (color);
995 900
996 if (i >= 8 && i <= 15) 901 if (i >= 8 && i <= 15)
997 { /* bright colors */ 902 { /* bright colors */
998 i -= 8; 903 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 905 SET_PIXCOLOR (idx);
1002 goto done; 906 goto done;
1003# endif
1004 } 907 }
1005 908
1006 if (i >= 0 && i <= 7) 909 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 910 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1039 /* Cursor cursor; */ 942 /* Cursor cursor; */
1040done: 943done:
1041 944
1042#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1043 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1044 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]);
1045#endif 948#endif
1046 949
1047 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1048 951
1049 recolour_cursor (); 952 recolour_cursor ();
… …
1064 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1065 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1066 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1067 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1068 971
1069 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
1070 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1071} 974}
1072 975
1073/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1074/* 977/*
… …
1079{ 982{
1080 unsigned int i; 983 unsigned int i;
1081 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1082 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1083 986
1084 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1085 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1086 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1087 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1088 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1089 { 991 {
… …
1107/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1108 1010
1109int 1011int
1110rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1111{ 1013{
1112 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1113 { 1015 {
1114 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1115 return false; 1017 return false;
1116 } 1018 }
1117 1019
… …
1123 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1124void 1026void
1125rxvt_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)
1126{ 1028{
1127 int fix_screen; 1029 int fix_screen;
1128 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1129 dDisp; 1031 int old_height = szHint.height;
1130 1032
1131 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1133 1035
1134 if (!ignoreparent) 1036 if (!ignoreparent)
1135 { 1037 {
1136#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1137 /* 1039 /*
… …
1141 int x, y, x1, y1; 1043 int x, y, x1, y1;
1142 int dx, dy; 1044 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1046 Window unused_cr;
1145 1047
1146 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1052 /*
1151 * 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
1152 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1153 */ 1055 */
… …
1155 { 1057 {
1156 x -= x1; 1058 x -= x1;
1157 y -= y1; 1059 y -= y1;
1158 } 1060 }
1159 1061
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1164 1066
1165 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1167 dx = 0; 1069 dx = 0;
… …
1170 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1171 dy = 0; 1073 dy = 0;
1172 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1173 dy /= 2; 1075 dy /= 2;
1174 1076
1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1177#else 1079#else
1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1179#endif 1081#endif
1180 } 1082 }
1181 1083
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1085
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1087 {
1186 if (scrollbar_visible ()) 1088 if (scrollBar.state)
1187 { 1089 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1189 window_sb_x, 0, 1091 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1093 resize_scrollbar ();
1192 } 1094 }
1193 1095
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1200 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1098 width, height);
1202 1099
1203 scr_clear (); 1100 scr_clear ();
1204#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1102 resize_pixmap ();
1206#endif 1103#endif
1207 } 1104 }
1208 1105
1209 if (fix_screen || old_height == 0) 1106 if (fix_screen || old_height == 0)
1210 {
1211 int curr_screen = -1;
1212 int old_ncol = prev_ncol;
1213
1214 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */
1216 {
1217 unsigned int ocol = ncol;
1218 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY);
1220 ncol = ocol;
1221 }
1222
1223 scr_reset (); 1107 scr_reset ();
1224
1225 if (curr_screen >= 0) /* this is not the first time through */
1226 {
1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != ncol ? 4 : 0);
1229 }
1230 }
1231
1232 old_width = szHint.width;
1233 old_height = szHint.height;
1234 1108
1235#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1236 if (pixmap) 1110 if (pixmap)
1237 scr_touch (false); 1111 scr_touch (false);
1238#endif 1112#endif
… …
1341 XPoint nspot; 1215 XPoint nspot;
1342 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1343 1217
1344 if (!Input_Context 1218 if (!Input_Context
1345 || !focus 1219 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1347 return; 1221 return;
1348 1222
1349 im_set_position (nspot); 1223 im_set_position (nspot);
1350 1224
1351 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1370 input_method = 0; 1244 input_method = 0;
1371 } 1245 }
1372 1246
1373 Input_Context = 0; 1247 Input_Context = 0;
1374} 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
1375 1323
1376/* 1324/*
1377 * 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
1378 * open a suitable preedit type 1326 * open a suitable preedit type
1379 */ 1327 */
… …
1386 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1335 unsigned long fg, bg;
1388 const char *p; 1336 const char *p;
1389 char **s; 1337 char **s;
1390 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1342
1343 set_environ (envv);
1391 1344
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1346 return false;
1394 1347
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1349 if (input_method == NULL)
1398 return false; 1350 return false;
1399 1351
1400 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1420 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1421 1373
1422 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1423 { 1375 {
1424 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1425 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1426 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1427 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1428 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1429 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1430 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1431 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;
1432 1390
1433 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1434 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1435 { 1393 {
1436 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1525 XNBackground, bg, 1483 XNBackground, bg,
1526 XNArea, &status_rect, 1484 XNArea, &status_rect,
1527 XNFontSet, fs, 1485 XNFontSet, fs,
1528 NULL); 1486 NULL);
1529 } 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
1530 1511
1531 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1533 XNClientWindow, vt, 1514 XNClientWindow, vt,
1534 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1528 im_destroy ();
1548 return false; 1529 return false;
1549 } 1530 }
1550 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
1551 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1552 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1553 1540
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1541 return true;
1556} 1542}
1557 1543
1558void 1544void
1559rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1561 int i; 1547 int i;
1562 const char *p; 1548 const char *p;
1563 char **s; 1549 char **s;
1564 char buf[IMBUFSIZ]; 1550 char buf[IMBUFSIZ];
1565 1551
1566 SET_R (this); 1552 make_current ();
1567 1553
1568 im_destroy (); 1554 im_destroy ();
1569 1555
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1556 if (Input_Context)
1572 return; 1557 return;
1573 1558
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1648 XFree (preedit_attr); 1633 XFree (preedit_attr);
1649 XFree (status_attr); 1634 XFree (status_attr);
1650} 1635}
1651#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1652 1637
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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