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.152 by root, Thu Dec 22 16:44:10 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
293void 291void
294rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
295{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
296 cmd_pid = 0; 296 cmd_pid = 0;
297 297
298 if (!(options & Opt_hold)) 298 if (!OPTION (Opt_hold))
299 destroy (); 299 destroy ();
300} 300}
301 301
302void 302void
303rxvt_term::destroy () 303rxvt_term::destroy ()
304{ 304{
305 if (destroy_ev.active) 305 if (destroy_ev.active)
306 return; 306 return;
307 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
308#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
309 scr_overlay_off (); 311 scr_overlay_off ();
310#endif 312#endif
311 313
312 if (display) 314 if (display)
… …
314#if USE_XIM 316#if USE_XIM
315 im_ev.stop (display); 317 im_ev.stop (display);
316#endif 318#endif
317#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 321#endif
323#if TRANSPARENT 322#if TRANSPARENT
324 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
325#endif 324#endif
326 incr_ev.stop (); 325 incr_ev.stop ();
… …
350} 349}
351 350
352void 351void
353rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
354{ 353{
355 SET_R (this); 354 make_current ();
356 355
357 delete this; 356 delete this;
358} 357}
359 358
360/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
448 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
449} 448}
450 449
451/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
452bool 451bool
453rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 453{
454 this->envv = envv;
455
455 SET_R (this); 456 SET_R (this);
456
457 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
458 459
459 if (!init_vars ()) 460 if (!init_vars ())
460 return false; 461 return false;
461 462
462 init_secondary (); 463 init_secondary ();
… …
465 466
466#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 468 keyboard->register_done ();
468#endif 469#endif
469 470
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 472 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 474#endif
477 475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv); 478 create_windows (argc, argv);
479 479
480 dDisp;
481
482 init_xlocale (); 480 init_xlocale ();
483 481
484 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
485 483
486#if 0 484#if 0
487 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
488#endif 486#endif
489 487
490#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 489 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
493#endif 491#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 492#ifdef TRANSPARENT
499 if (options & Opt_transparent) 493 if (OPTION (Opt_transparent))
500 { 494 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
502 check_our_parents (); 496 check_our_parents ();
503 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
504 } 498 }
505#endif 499#endif
506 500
507 XMapWindow (disp, vt);
508 XMapWindow (disp, parent[0]);
509
510 set_colorfgbg (); 501 set_colorfgbg ();
511 502
512 init_command (cmd_argv); 503 init_command (cmd_argv);
513 504
514 free (cmd_argv); 505 free (cmd_argv);
515 506
507 if (pty->pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
517 509
518 check_ev.start (); 510 check_ev.start ();
519 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
520 return true; 527 return true;
521} 528}
522 529
523static struct sig_handlers 530static struct sig_handlers
524{ 531{
525 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
526 533
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /* 534 /*
542 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
543 */ 536 */
544 void 537 void
545 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
546 { 539 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
553 } 543 }
554 544
555 sig_handlers () 545 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
559 { 548 {
560 } 549 }
561} sig_handlers; 550} sig_handlers;
562 551
552char **rxvt_environ; // startup environment
553
563void 554void
564rxvt_init () 555rxvt_init ()
565{ 556{
566 /* 557 ptytty::init ();
567 * Save and then give up any super-user privileges 558
568 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
569 * We should only need to be root in these cases:
570 * 1. write utmp entries on some systems
571 * 2. chown tty on some systems
572 */
573 rxvt_privileges (SAVE);
574 rxvt_privileges (IGNORE);
575 560
576 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
578 563
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
582 566
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
585 569
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
573
574 XrmInitialize ();
589} 575}
590 576
591/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
612 598
613 return p; 599 return p;
614} 600}
615 601
616void * 602void *
617rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
618{ 604{
619 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
620 606
621 if (!p) 607 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
623 609
624 return p; 610 return p;
625} 611}
626
627/* ------------------------------------------------------------------------- *
628 * PRIVILEGED OPERATIONS *
629 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */
631void
632rxvt_privileges (rxvt_privaction action)
633{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a))
644# define HAVE_SETEUID
645# endif
646# ifdef HAVE_SETEUID
647 switch (action)
648 {
649 case IGNORE:
650 /*
651 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required
653 */
654 seteuid (getuid ());
655 setegid (getgid ());
656 break;
657 case SAVE:
658 euid = geteuid ();
659 egid = getegid ();
660 break;
661 case RESTORE:
662 seteuid (euid);
663 setegid (egid);
664 break;
665 }
666# else
667 switch (action)
668 {
669 case IGNORE:
670 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */
673 case SAVE:
674 /* FALLTHROUGH */
675 case RESTORE:
676 break;
677 }
678# endif
679#endif
680}
681
682#ifdef UTMP_SUPPORT
683void
684rxvt_term::privileged_utmp (rxvt_privaction action)
685{
686 if ((options & Opt_utmpInhibit)
687 || !pty.name || !*pty.name)
688 return;
689
690 rxvt_privileges (RESTORE);
691
692 if (action == SAVE)
693 makeutent (pty.name, rs[Rs_display_name]);
694 else
695 cleanutent ();
696
697 rxvt_privileges (IGNORE);
698}
699#endif
700 612
701/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
702/* 614/*
703 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
705 */ 617 */
706void 618void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 620{
709 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
711 unsigned int w, h; 623 unsigned int w, h;
712 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
713 dDisp;
714
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716 ncol, nrow, szHint.width, szHint.height));
717 625
718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
719 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
721 629
… …
776 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
778 686
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 688
781 sb_w = mb_h = 0; 689 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
783 691
784 if (scrollbar_visible ()) 692 if (scrollBar.state)
785 { 693 {
786 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 697 window_vt_x += sb_w;
790 }
791
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 } 698 }
798 699
799 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
821 { 722 {
822 min_it (height, max_height); 723 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
824 } 725 }
825 726
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
828 729
829 if (recalc_x) 730 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
831 if (recalc_y) 733 if (recalc_y)
832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
833 735
834 ncol = width / fwidth; 736 ncol = width / fwidth;
835 nrow = height / fheight; 737 nrow = height / fheight;
836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
837 ncol, nrow, szHint.width,
838 szHint.height));
839 return;
840} 738}
841 739
842/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
843/* 741/*
844 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
845 * Called after a window size change. 743 * Called after a window size change.
846 */ 744 */
847void 745void
848rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
849{ 747{
850 if (pty.pty < 0) 748 if (pty->pty < 0)
851 return; 749 return;
852 750
853 struct winsize ws; 751 struct winsize ws;
854 752
855 ws.ws_col = ncol; 753 ws.ws_col = ncol;
856 ws.ws_row = nrow; 754 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 758
861#if 0 759#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
900 prop.height += lineSpace; 798 prop.height += lineSpace;
901 fs->set_prop (prop); 799 fs->set_prop (prop);
902 800
903 fwidth = prop.width; 801 fwidth = prop.width;
904 fheight = prop.height; 802 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 803 fbase = prop.ascent;
906 804
907 for (int style = 1; style < 4; style++) 805 for (int style = 1; style < 4; style++)
908 { 806 {
909#if ENABLE_STYLES 807#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 808 const char *res = rs[Rs_font + style];
… …
944 return true; 842 return true;
945} 843}
946 844
947void 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)
948{ 846{
949 // TODO: SMART_WINDOW_TITLE
950 XChangeProperty (display->display, parent[0], 847 XChangeProperty (display->display, parent[0],
951 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
952 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
953} 850}
954 851
955void 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)
956{ 853{
957 // TODO: SMART_WINDOW_TITLE
958 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
959 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
960 856
961 XChangeProperty (display->display, parent[0], 857 XChangeProperty (display->display, parent[0],
962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
1003 i = atoi (color); 899 i = atoi (color);
1004 900
1005 if (i >= 8 && i <= 15) 901 if (i >= 8 && i <= 15)
1006 { /* bright colors */ 902 { /* bright colors */
1007 i -= 8; 903 i -= 8;
1008# ifndef NO_BRIGHTCOLOR
1009 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1010 SET_PIXCOLOR (idx); 905 SET_PIXCOLOR (idx);
1011 goto done; 906 goto done;
1012# endif
1013 } 907 }
1014 908
1015 if (i >= 0 && i <= 7) 909 if (i >= 0 && i <= 7)
1016 { /* normal colors */ 910 { /* normal colors */
1017 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1048 /* Cursor cursor; */ 942 /* Cursor cursor; */
1049done: 943done:
1050 944
1051#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1052 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1053 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]);
1054#endif 948#endif
1055 949
1056 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1057 951
1058 recolour_cursor (); 952 recolour_cursor ();
… …
1073 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1074 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1075 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1076 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1077 971
1078 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
1079 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1080} 974}
1081 975
1082/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1083/* 977/*
… …
1088{ 982{
1089 unsigned int i; 983 unsigned int i;
1090 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1091 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1092 986
1093 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1094 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1095 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1096 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1097 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1098 { 991 {
… …
1116/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1117 1010
1118int 1011int
1119rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1120{ 1013{
1121 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1122 { 1015 {
1123 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1124 return false; 1017 return false;
1125 } 1018 }
1126 1019
… …
1132 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1133void 1026void
1134rxvt_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)
1135{ 1028{
1136 int fix_screen; 1029 int fix_screen;
1137 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1138 dDisp; 1031 int old_height = szHint.height;
1139 1032
1140 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1141 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1142 1035
1143 if (!ignoreparent) 1036 if (!ignoreparent)
1144 { 1037 {
1145#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1146 /* 1039 /*
… …
1150 int x, y, x1, y1; 1043 int x, y, x1, y1;
1151 int dx, dy; 1044 int dx, dy;
1152 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1153 Window unused_cr; 1046 Window unused_cr;
1154 1047
1155 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1156 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1157 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1158 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1159 /* 1052 /*
1160 * 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
1161 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1162 */ 1055 */
… …
1164 { 1057 {
1165 x -= x1; 1058 x -= x1;
1166 y -= y1; 1059 y -= y1;
1167 } 1060 }
1168 1061
1169 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1170 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1171 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1172 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1173 1066
1174 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1175 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1176 dx = 0; 1069 dx = 0;
… …
1179 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1180 dy = 0; 1073 dy = 0;
1181 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1182 dy /= 2; 1075 dy /= 2;
1183 1076
1184 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1185 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1186#else 1079#else
1187 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1188#endif 1081#endif
1189 } 1082 }
1190 1083
1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1192 1085
1193 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1194 { 1087 {
1195 if (scrollbar_visible ()) 1088 if (scrollBar.state)
1196 { 1089 {
1197 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1198 window_sb_x, 0, 1091 window_sb_x, 0,
1199 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1200 resize_scrollbar (); 1093 resize_scrollbar ();
1201 } 1094 }
1202 1095
1203 if (menubar_visible ())
1204 XMoveResizeWindow (disp, menuBar.win,
1205 window_vt_x, 0,
1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1207
1208 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1209 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1210 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1098 width, height);
1211 1099
1212 scr_clear (); 1100 scr_clear ();
1213#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1214 resize_pixmap (); 1102 resize_pixmap ();
1215#endif 1103#endif
1216 } 1104 }
1217 1105
1218 if (fix_screen || old_height == 0) 1106 if (fix_screen || old_height == 0)
1219 {
1220 int curr_screen = -1;
1221 int old_ncol = prev_ncol;
1222
1223 /* scr_reset only works on the primary screen */
1224 if (old_height) /* this is not the first time through */
1225 {
1226 unsigned int ocol = ncol;
1227 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1228 curr_screen = scr_change_screen (PRIMARY);
1229 ncol = ocol;
1230 }
1231
1232 scr_reset (); 1107 scr_reset ();
1233
1234 if (curr_screen >= 0) /* this is not the first time through */
1235 {
1236 scr_change_screen (curr_screen);
1237 selection_check (old_ncol != ncol ? 4 : 0);
1238 }
1239 }
1240
1241 old_width = szHint.width;
1242 old_height = szHint.height;
1243 1108
1244#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1245 if (pixmap) 1110 if (pixmap)
1246 scr_touch (false); 1111 scr_touch (false);
1247#endif 1112#endif
… …
1350 XPoint nspot; 1215 XPoint nspot;
1351 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1352 1217
1353 if (!Input_Context 1218 if (!Input_Context
1354 || !focus 1219 || !focus
1355 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1356 return; 1221 return;
1357 1222
1358 im_set_position (nspot); 1223 im_set_position (nspot);
1359 1224
1360 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1379 input_method = 0; 1244 input_method = 0;
1380 } 1245 }
1381 1246
1382 Input_Context = 0; 1247 Input_Context = 0;
1383} 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
1384 1323
1385/* 1324/*
1386 * 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
1387 * open a suitable preedit type 1326 * open a suitable preedit type
1388 */ 1327 */
… …
1395 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1396 unsigned long fg, bg; 1335 unsigned long fg, bg;
1397 const char *p; 1336 const char *p;
1398 char **s; 1337 char **s;
1399 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1342
1343 set_environ (envv);
1400 1344
1401 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1402 return false; 1346 return false;
1403 1347
1404 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1405 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1406 if (input_method == NULL) 1349 if (input_method == NULL)
1407 return false; 1350 return false;
1408 1351
1409 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1429 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1430 1373
1431 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1432 { 1375 {
1433 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1434 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1435 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1436 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1437 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1438 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1439 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1440 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;
1441 1390
1442 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1443 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1444 { 1393 {
1445 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1534 XNBackground, bg, 1483 XNBackground, bg,
1535 XNArea, &status_rect, 1484 XNArea, &status_rect,
1536 XNFontSet, fs, 1485 XNFontSet, fs,
1537 NULL); 1486 NULL);
1538 } 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
1539 1511
1540 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1541 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1542 XNClientWindow, vt, 1514 XNClientWindow, vt,
1543 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1555 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1556 im_destroy (); 1528 im_destroy ();
1557 return false; 1529 return false;
1558 } 1530 }
1559 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
1560 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1561 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1562 1540
1563 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1564 return true; 1541 return true;
1565} 1542}
1566 1543
1567void 1544void
1568rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1570 int i; 1547 int i;
1571 const char *p; 1548 const char *p;
1572 char **s; 1549 char **s;
1573 char buf[IMBUFSIZ]; 1550 char buf[IMBUFSIZ];
1574 1551
1575 SET_R (this); 1552 make_current ();
1576 1553
1577 im_destroy (); 1554 im_destroy ();
1578 1555
1579 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1580 if (Input_Context) 1556 if (Input_Context)
1581 return; 1557 return;
1582 1558
1583#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1584 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1657 XFree (preedit_attr); 1633 XFree (preedit_attr);
1658 XFree (status_attr); 1634 XFree (status_attr);
1659} 1635}
1660#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1661 1637
1662/*----------------------------------------------------------------------*/
1663rxvt_t rxvt_current_term;
1664
1665/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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