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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.208 by root, Mon Jan 30 19:46:13 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"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
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]; 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;
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);
64} 80}
65 81
66#if ENABLE_COMBINING 82#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
68 84
… …
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 150#endif
135#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 153#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 156#endif
144#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
162 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
171 188
172 termlist.push_back (this); 189 termlist.push_back (this);
173 190
174#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 193#endif
180} 194}
181 195
182// 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.
183// for use before an emergency exit 197// for use before an emergency exit
184void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
185{ 199{
186 if (cmd_pid) 200 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
188 202
189#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
190 privileged_utmp (RESTORE);
191#endif
192
193 pty.put ();
194} 204}
195 205
196rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
197{ 207{
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
206#endif 216#endif
207 delete fontset[0]; 217 delete fontset[0];
208 218
209 if (display) 219 if (display)
210 { 220 {
211 dDisp;
212
213 selection_clear (); 221 selection_clear ();
214 222
215#ifdef USE_XIM 223#ifdef USE_XIM
216 im_destroy (); 224 im_destroy ();
217#endif 225#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif
221#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
224#endif 229#endif
225#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
227#endif 232#endif
228#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
229 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
230 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
231 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
232 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
233 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
234 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
235 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
239#endif 244#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
244#endif 249#endif
245 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
246 251
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete drawable; 252 delete drawable;
253 // destroy all windows 253 // destroy all windows
254 if (parent[0]) 254 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
256 } 258 }
257 259
258 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 261 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
263#endif 264#endif
264 265
… …
270 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 272 free (allocated [i]);
272 273
273 free (selection.text); 274 free (selection.text);
274 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 276 free (env_display);
277 free (env_term); 277 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 278 free (locale);
280 free (v_buffer); 279 free (v_buffer);
281 free (incr_buf); 280 free (incr_buf);
282 281
283 delete envv; 282 delete envv;
… …
286#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
287 delete keyboard; 286 delete keyboard;
288#endif 287#endif
289} 288}
290 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
291void 302void
292rxvt_term::destroy () 303rxvt_term::destroy ()
293{ 304{
294 if (destroy_ev.active) 305 if (destroy_ev.active)
295 return; 306 return;
296 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
297#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
298 scr_overlay_off (); 311 scr_overlay_off ();
299#endif 312#endif
300 313
301 if (display) 314 if (display)
… …
303#if USE_XIM 316#if USE_XIM
304 im_ev.stop (display); 317 im_ev.stop (display);
305#endif 318#endif
306#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
308#endif
309#if MENUBAR
310 menubar_ev.stop (display);
311#endif 321#endif
312#if TRANSPARENT 322#if TRANSPARENT
313 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
314#endif 324#endif
315 incr_ev.stop (); 325 incr_ev.stop ();
… …
339} 349}
340 350
341void 351void
342rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
343{ 353{
344 SET_R (this); 354 make_current ();
345 355
346 delete this; 356 delete this;
347} 357}
348 358
349/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
437 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
438} 448}
439 449
440/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
441bool 451bool
442rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
443{ 453{
454 this->envv = envv;
455
444 SET_R (this); 456 SET_R (this);
445
446 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
447 459
448 if (!init_vars ()) 460 if (!init_vars ())
449 return false; 461 return false;
450 462
451 init_secondary (); 463 init_secondary ();
… …
454 466
455#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 468 keyboard->register_done ();
457#endif 469#endif
458 470
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 472 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 474#endif
466 475
476 pty = ptytty::create ();
477
467 create_windows (argc, argv); 478 create_windows (argc, argv);
468 479
469 dDisp;
470
471 init_xlocale (); 480 init_xlocale ();
472 481
473 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
474 483
475#if 0 484#if 0
476 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
477#endif 486#endif
478 487
479#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 489 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
482#endif 491#endif
483#if (MENUBAR_MAX)
484 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win);
486#endif
487#ifdef TRANSPARENT 492#ifdef TRANSPARENT
488 if (options & Opt_transparent) 493 if (OPTION (Opt_transparent))
489 { 494 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
491 check_our_parents (); 496 check_our_parents ();
492 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
493 } 498 }
494#endif 499#endif
495 500
496 XMapWindow (disp, vt);
497 XMapWindow (disp, parent[0]);
498
499 set_colorfgbg (); 501 set_colorfgbg ();
500 502
501 init_command (cmd_argv); 503 init_command (cmd_argv);
502 504
503 free (cmd_argv); 505 free (cmd_argv);
504 506
507 if (pty->pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
506 509
507 check_ev.start (); 510 check_ev.start ();
508 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 (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
509 return true; 527 return true;
510} 528}
511 529
512static struct sig_handlers 530static struct sig_handlers
513{ 531{
514 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
515 533
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529
530 /* 534 /*
531 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
532 */ 536 */
533 void 537 void
534 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
535 { 539 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
542 } 543 }
543 544
544 sig_handlers () 545 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
548 { 548 {
549 } 549 }
550} sig_handlers; 550} sig_handlers;
551 551
552char **rxvt_environ; // startup environment
553
552void 554void
553rxvt_init () 555rxvt_init ()
554{ 556{
555 /* 557 ptytty::init ();
556 * Save and then give up any super-user privileges 558
557 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
558 * We should only need to be root in these cases:
559 * 1. write utmp entries on some systems
560 * 2. chown tty on some systems
561 */
562 rxvt_privileges (SAVE);
563 rxvt_privileges (IGNORE);
564 560
565 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
567 563
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
571 566
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
574 569
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
573
574 XrmInitialize ();
578} 575}
579 576
580/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
601 598
602 return p; 599 return p;
603} 600}
604 601
605void * 602void *
606rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
607{ 604{
608 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
609 606
610 if (!p) 607 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
612 609
613 return p; 610 return p;
614} 611}
615
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689 612
690/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
691/* 614/*
692 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
694 */ 617 */
695void 618void
696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 620{
698 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
700 unsigned int w, h; 623 unsigned int w, h;
701 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
702 dDisp;
703
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 ncol, nrow, szHint.width, szHint.height));
706 625
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 629
… …
718 if (rs[Rs_geometry]) 637 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 638 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 639
721 if (flags & WidthValue) 640 if (flags & WidthValue)
722 { 641 {
723 ncol = BOUND_POSITIVE_INT16 (w); 642 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 643 szHint.flags |= USSize;
725 } 644 }
726 645
727 if (flags & HeightValue) 646 if (flags & HeightValue)
728 { 647 {
729 nrow = BOUND_POSITIVE_INT16 (h); 648 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 649 szHint.flags |= USSize;
731 } 650 }
732 651
733 if (flags & XValue) 652 if (flags & XValue)
734 { 653 {
… …
765 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
766 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
767 686
768 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
769 688
770 sb_w = mb_h = 0; 689 sb_w = 0;
771 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
772 691
773 if (scrollbar_visible ()) 692 if (scrollBar.state)
774 { 693 {
775 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 697 window_vt_x += sb_w;
779 }
780
781 if (menubar_visible ())
782 {
783 mb_h = menuBar_TotalHeight ();
784 szHint.base_height += mb_h;
785 window_vt_y += mb_h;
786 } 698 }
787 699
788 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
789 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
790 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
795 szHint.width = newwidth; 707 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 708 width = newwidth - szHint.base_width;
797 } 709 }
798 else 710 else
799 { 711 {
800 MIN_IT (width, max_width); 712 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 713 szHint.width = szHint.base_width + width;
802 } 714 }
803 715
804 if (newheight && newheight - szHint.base_height < max_height) 716 if (newheight && newheight - szHint.base_height < max_height)
805 { 717 {
806 szHint.height = newheight; 718 szHint.height = newheight;
807 height = newheight - szHint.base_height; 719 height = newheight - szHint.base_height;
808 } 720 }
809 else 721 else
810 { 722 {
811 MIN_IT (height, max_height); 723 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
813 } 725 }
814 726
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
817 729
818 if (recalc_x) 730 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
820 if (recalc_y) 733 if (recalc_y)
821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
822 735
823 ncol = width / fwidth; 736 ncol = width / fwidth;
824 nrow = height / fheight; 737 nrow = height / fheight;
825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
826 ncol, nrow, szHint.width,
827 szHint.height));
828 return;
829} 738}
830 739
831/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
832/* 741/*
833 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
834 * Called after a window size change. 743 * Called after a window size change.
835 */ 744 */
836void 745void
837rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
838{ 747{
839 if (pty.pty < 0) 748 if (pty->pty < 0)
840 return; 749 return;
841 750
842 struct winsize ws; 751 struct winsize ws;
843 752
844 ws.ws_col = ncol; 753 ws.ws_col = ncol;
845 ws.ws_row = nrow; 754 ws.ws_row = nrow;
846 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
847 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 758
850#if 0 759#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
853 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
889 prop.height += lineSpace; 798 prop.height += lineSpace;
890 fs->set_prop (prop); 799 fs->set_prop (prop);
891 800
892 fwidth = prop.width; 801 fwidth = prop.width;
893 fheight = prop.height; 802 fheight = prop.height;
894 fweight = prop.weight; 803 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->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 (xdisp, 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 (xdisp, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
955 860
956 free (s); 861 free (s);
957 free (ws); 862 free (ws);
… …
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];
1009 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
1010 goto done; 913 goto done;
1011 } 914 }
1012 } 915 }
1013 916
1014 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
1015 return; 918 return;
1016 919
1017 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
1018 921
1019 /* 922 /*
1020 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
1021 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1022 */ 925 */
… …
1025 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
1026 break; 929 break;
1027 if (i > Color_White) 930 if (i > Color_White)
1028 { 931 {
1029 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1030 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1031 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
1032 } 935 }
1033# endif 936# endif
1034 937
1035 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
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 (xdisp, cmap, xcol, 2);
1070 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1071} 974}
1072 975
1073/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1074/* 977/*
1075 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
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 {
… …
1104 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1105} 1007}
1106 1008
1107/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1108 1010
1109int 1011bool
1110rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1111{ 1013{
1112 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1113 {
1114 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1115 return false;
1116 }
1117
1118 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1119} 1019}
1120 1020
1121/* -------------------------------------------------------------------- * 1021/* -------------------------------------------------------------------- *
1122 * - WINDOW RESIZING - * 1022 * - WINDOW RESIZING - *
1123 * -------------------------------------------------------------------- */ 1023 * -------------------------------------------------------------------- */
1124void 1024void
1125rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1025rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1126{ 1026{
1127 int fix_screen; 1027 int fix_screen;
1128 int old_width = szHint.width, old_height = szHint.height; 1028 int old_width = szHint.width;
1129 dDisp; 1029 int old_height = szHint.height;
1130 1030
1131 window_calc (newwidth, newheight); 1031 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (xdisp, parent[0], &szHint);
1133 1033
1134 if (!ignoreparent) 1034 if (!ignoreparent)
1135 { 1035 {
1136#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1137 /* 1037 /*
… …
1141 int x, y, x1, y1; 1041 int x, y, x1, y1;
1142 int dx, dy; 1042 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1044 Window unused_cr;
1145 1045
1146 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (xdisp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1050 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1051 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1153 */ 1053 */
… …
1155 { 1055 {
1156 x -= x1; 1056 x -= x1;
1157 y -= y1; 1057 y -= y1;
1158 } 1058 }
1159 1059
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1164 1064
1165 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
1167 dx = 0; 1067 dx = 0;
… …
1170 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1171 dy = 0; 1071 dy = 0;
1172 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1173 dy /= 2; 1073 dy /= 2;
1174 1074
1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1177#else 1077#else
1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1179#endif 1079#endif
1180 } 1080 }
1181 1081
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1083
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1085 {
1186 if (scrollbar_visible ()) 1086 if (scrollBar.state)
1187 { 1087 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (xdisp, scrollBar.win,
1189 window_sb_x, 0, 1089 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1091 resize_scrollbar ();
1192 } 1092 }
1193 1093
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (xdisp, vt,
1200 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1096 width, height);
1202 1097
1203 scr_clear (); 1098 scr_clear ();
1204#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1100 resize_pixmap ();
1206#endif 1101#endif
1207 } 1102 }
1208 1103
1209 if (fix_screen || old_height == 0) 1104 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 (); 1105 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 1106
1235#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1236 if (pixmap) 1108 if (pixmap)
1237 scr_touch (false); 1109 scr_touch (false);
1238#endif 1110#endif
… …
1251{ 1123{
1252 XWindowAttributes wattr; 1124 XWindowAttributes wattr;
1253 1125
1254 if (newwidth == 0 || newheight == 0) 1126 if (newwidth == 0 || newheight == 0)
1255 { 1127 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1128 XGetWindowAttributes (xdisp, display->root, &wattr);
1257 1129
1258 if (newwidth == 0) 1130 if (newwidth == 0)
1259 newwidth = wattr.width - szHint.base_width; 1131 newwidth = wattr.width - szHint.base_width;
1260 if (newheight == 0) 1132 if (newheight == 0)
1261 newheight = wattr.height - szHint.base_height; 1133 newheight = wattr.height - szHint.base_height;
… …
1323 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1324 1196
1325 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1326 *p = '\0'; 1198 *p = '\0';
1327 1199
1328 atom = XInternAtom (display->display, server, False); 1200 atom = XInternAtom (xdisp, server, False);
1329 win = XGetSelectionOwner (display->display, atom); 1201 win = XGetSelectionOwner (xdisp, atom);
1330 1202
1331 if (win != None) 1203 if (win != None)
1332 return True; 1204 return True;
1333 } 1205 }
1334 1206
… …
1341 XPoint nspot; 1213 XPoint nspot;
1342 XVaNestedList preedit_attr; 1214 XVaNestedList preedit_attr;
1343 1215
1344 if (!Input_Context 1216 if (!Input_Context
1345 || !focus 1217 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1218 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1347 return; 1219 return;
1348 1220
1349 im_set_position (nspot); 1221 im_set_position (nspot);
1350 1222
1351 if (nspot.x == spot.x && nspot.y == spot.y) 1223 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1370 input_method = 0; 1242 input_method = 0;
1371 } 1243 }
1372 1244
1373 Input_Context = 0; 1245 Input_Context = 0;
1374} 1246}
1247
1248#ifdef ENABLE_XIM_ONTHESPOT
1249
1250static void
1251xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1252{
1253 ((rxvt_term *)client_data)->make_current ();
1254 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1255}
1256
1257static void
1258xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1259{
1260 ((rxvt_term *)client_data)->make_current ();
1261 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1262}
1263
1264static void
1265xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1266{
1267 rxvt_term *term = (rxvt_term *)client_data;
1268 XIMText *text = call_data->text;
1269
1270 term->make_current ();
1271
1272 if (text)
1273 {
1274 void *str;
1275
1276 if (!text->encoding_is_wchar && text->string.multi_byte)
1277 {
1278 // of course, X makes it ugly again
1279 if (term->rs[Rs_imLocale])
1280 SET_LOCALE (term->rs[Rs_imLocale]);
1281
1282 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1283 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1284
1285 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->locale);
1287 }
1288 else
1289 str = (void *)text->string.wide_char;
1290
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length,
1295 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1296 DT_WCS_LEN, str, str ? (int)text->length : 0,
1297 DT_END));
1298 }
1299 else
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_END));
1305}
1306
1307#if 0
1308static void
1309xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1310{
1311 ((rxvt_term *)client_data)->make_current ();
1312 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1313 DT_INT, call_data->position,
1314 DT_INT, call_data->direction,
1315 DT_INT, call_data->style,
1316 DT_END));
1317}
1318#endif
1319
1320#endif
1375 1321
1376/* 1322/*
1377 * Try to open a XIM with the current modifiers, then see if we can 1323 * Try to open a XIM with the current modifiers, then see if we can
1378 * open a suitable preedit type 1324 * open a suitable preedit type
1379 */ 1325 */
… …
1386 XRectangle rect, status_rect, needed_rect; 1332 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1333 unsigned long fg, bg;
1388 const char *p; 1334 const char *p;
1389 char **s; 1335 char **s;
1390 XIMStyles *xim_styles; 1336 XIMStyles *xim_styles;
1337#ifdef ENABLE_XIM_ONTHESPOT
1338 XIMCallback xcb[4];
1339#endif
1340
1341 set_environ (envv);
1391 1342
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1344 return false;
1394 1345
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1346 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1347 if (input_method == NULL)
1398 return false; 1348 return false;
1399 1349
1400 xim = input_method->xim; 1350 xim = input_method->xim;
… …
1420 s = rxvt_splitcommastring (p); 1370 s = rxvt_splitcommastring (p);
1421 1371
1422 for (i = found = 0; !found && s[i]; i++) 1372 for (i = found = 0; !found && s[i]; i++)
1423 { 1373 {
1424 if (!strcmp (s[i], "OverTheSpot")) 1374 if (!strcmp (s[i], "OverTheSpot"))
1425 input_style = (XIMPreeditPosition | XIMStatusNothing); 1375 input_style = XIMPreeditPosition | XIMStatusNothing;
1426 else if (!strcmp (s[i], "OffTheSpot")) 1376 else if (!strcmp (s[i], "OffTheSpot"))
1427 input_style = (XIMPreeditArea | XIMStatusArea); 1377 input_style = XIMPreeditArea | XIMStatusArea;
1428 else if (!strcmp (s[i], "Root")) 1378 else if (!strcmp (s[i], "Root"))
1429 input_style = (XIMPreeditNothing | XIMStatusNothing); 1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1430 else if (!strcmp (s[i], "None")) 1380 else if (!strcmp (s[i], "None"))
1431 input_style = (XIMPreeditNone | XIMStatusNone); 1381 input_style = XIMPreeditNone | XIMStatusNone;
1382#ifdef ENABLE_XIM_ONTHESPOT
1383 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1384 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1385#endif
1386 else
1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1432 1388
1433 for (j = 0; j < xim_styles->count_styles; j++) 1389 for (j = 0; j < xim_styles->count_styles; j++)
1434 if (input_style == xim_styles->supported_styles[j]) 1390 if (input_style == xim_styles->supported_styles[j])
1435 { 1391 {
1436 rxvt_freecommastring (s); 1392 rxvt_freecommastring (s);
… …
1474 "*", 1430 "*",
1475 fheight, 1431 fheight,
1476 fheight + 1, fheight - 1, 1432 fheight + 1, fheight - 1,
1477 fheight - 2, fheight + 2); 1433 fheight - 2, fheight + 2);
1478 1434
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1436 &missing_charset_list, &missing_charset_count, &def_string);
1481 1437
1482 if (missing_charset_list) 1438 if (missing_charset_list)
1483 XFreeStringList (missing_charset_list); 1439 XFreeStringList (missing_charset_list);
1484 1440
… …
1525 XNBackground, bg, 1481 XNBackground, bg,
1526 XNArea, &status_rect, 1482 XNArea, &status_rect,
1527 XNFontSet, fs, 1483 XNFontSet, fs,
1528 NULL); 1484 NULL);
1529 } 1485 }
1486#if ENABLE_XIM_ONTHESPOT
1487 else if (input_style & XIMPreeditCallbacks)
1488 {
1489 im_set_position (spot);
1490
1491 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1492 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1493 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1494# if 0
1495 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1496# endif
1497
1498 preedit_attr = XVaCreateNestedList (0,
1499 XNSpotLocation, &spot,
1500 XNPreeditStartCallback, &xcb[0],
1501 XNPreeditDoneCallback , &xcb[1],
1502 XNPreeditDrawCallback , &xcb[2],
1503# if 0
1504 XNPreeditCaretCallback, &xcb[3],
1505# endif
1506 NULL);
1507 }
1508#endif
1530 1509
1531 Input_Context = XCreateIC (xim, 1510 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1511 XNInputStyle, input_style,
1533 XNClientWindow, vt, 1512 XNClientWindow, vt,
1534 XNFocusWindow, parent[0], 1513 XNFocusWindow, parent[0],
… …
1537 status_attr ? XNStatusAttributes : NULL, 1516 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1517 status_attr, NULL);
1539 1518
1540 if (preedit_attr) XFree (preedit_attr); 1519 if (preedit_attr) XFree (preedit_attr);
1541 if (status_attr) XFree (status_attr); 1520 if (status_attr) XFree (status_attr);
1542 if (fs) XFreeFontSet (display->display, fs); 1521 if (fs) XFreeFontSet (xdisp, fs);
1543 1522
1544 if (Input_Context == NULL) 1523 if (Input_Context == NULL)
1545 { 1524 {
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1525 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1526 im_destroy ();
1548 return false; 1527 return false;
1549 } 1528 }
1550 1529
1530#if 0
1531 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input ();
1534#endif
1535
1551 if (input_style & XIMPreeditArea) 1536 if (input_style & XIMPreeditArea)
1552 IMSetStatusPosition (); 1537 IMSetStatusPosition ();
1553 1538
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1539 return true;
1556} 1540}
1557 1541
1558void 1542void
1559rxvt_term::im_cb () 1543rxvt_term::im_cb ()
… …
1561 int i; 1545 int i;
1562 const char *p; 1546 const char *p;
1563 char **s; 1547 char **s;
1564 char buf[IMBUFSIZ]; 1548 char buf[IMBUFSIZ];
1565 1549
1566 SET_R (this); 1550 make_current ();
1567 1551
1568 im_destroy (); 1552 im_destroy ();
1569 1553
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1554 if (Input_Context)
1572 return; 1555 return;
1573 1556
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1557#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1558 if (rs[Rs_imLocale])
… …
1648 XFree (preedit_attr); 1631 XFree (preedit_attr);
1649 XFree (status_attr); 1632 XFree (status_attr);
1650} 1633}
1651#endif /* USE_XIM */ 1634#endif /* USE_XIM */
1652 1635
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1636/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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