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.135 by root, Sun Feb 13 11:07:57 2005 UTC vs.
Revision 1.227 by root, Fri Jul 28 17:16:42 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
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 "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
53 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
54static char curlocale[128]; 56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
58{ 60{
61 int len = strlen (locale) + 1;
62
63 if (len > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
59 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, len))
60 return false; 67 return false;
61 68
62 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, len);
63 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
64 return true; 71 return true;
72}
73
74void
75rxvt_push_locale (const char *locale) NOTHROW
76{
77 strcpy (savelocale, curlocale);
78 rxvt_set_locale (locale);
79}
80
81void
82rxvt_pop_locale () NOTHROW
83{
84 rxvt_set_locale (savelocale);
65} 85}
66 86
67#if ENABLE_COMBINING 87#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 88class rxvt_composite_vec rxvt_composite;
69 89
128} 148}
129#endif 149#endif
130 150
131rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
132 : 152 :
133#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 155#endif
136#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 158#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 161#endif
145#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev (this, &rxvt_term::text_blink_cb),
158 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 176#endif
160#ifdef USE_XIM 177#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
162#endif 179#endif
163 sw_term (this, &rxvt_term::sig_term), 180#ifndef NO_BELL
164 sw_int (this, &rxvt_term::sig_term), 181 bell_ev (this, &rxvt_term::bell_cb),
165 sw_chld (this, &rxvt_term::sig_chld), 182#endif
166 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
168 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
171 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
172 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
175 193
176 termlist.push_back (this); 194 termlist.push_back (this);
177 195
178#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
179 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif 198#endif
184} 199}
185 200
186// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit 202// for use before an emergency exit
188void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
189{ 204{
190 if (cmd_pid) 205 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
192 207
193#ifdef UTMP_SUPPORT 208 pty_ev.stop ();
194 privileged_utmp (RESTORE); 209 delete pty; pty = 0;
195#endif
196
197 pty.put ();
198} 210}
199 211
200rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
201{ 213{
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 215
204 emergency_cleanup (); 216 emergency_cleanup ();
205 217
206#if ENABLE_STYLES 218#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 219 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 220 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 221 delete fontset[i];
210#endif 222#endif
211 delete TermWin.fontset[0]; 223 delete fontset[0];
212 224
213 if (display) 225 if (display)
214 { 226 {
215 dDisp;
216
217 selection_clear (); 227 selection_clear ();
218 228
219#ifdef USE_XIM 229#ifdef USE_XIM
220 im_destroy (); 230 im_destroy ();
221#endif 231#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif
225#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 235#endif
229#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 238#endif
232#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 250#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 251#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 255#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 256 if (gc) XFreeGC (dpy, gc);
250 257
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 258 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 259 // destroy all windows
258 if (TermWin.parent[0]) 260 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 261 XDestroyWindow (dpy, parent[0]);
260 }
261 262
262 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
263 274
264 delete pix_colors_focused; 275 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
267#endif 278#endif
268 279
269 displays.put (display); 280 displays.put (display);
270 281
274 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 286 free (allocated [i]);
276 287
277 free (selection.text); 288 free (selection.text);
278 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
279 free (env_windowid);
280 free (env_display); 290 free (env_display);
281 free (env_term); 291 free (env_term);
282 free (env_colorfgbg);
283 free (locale); 292 free (locale);
284 free (v_buffer); 293 free (v_buffer);
285 free (incr_buf); 294 free (incr_buf);
286 295
287 delete envv; 296 delete envv;
290#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
291 delete keyboard; 300 delete keyboard;
292#endif 301#endif
293} 302}
294 303
304// child has exited, usually destroys
305void
306rxvt_term::child_cb (child_watcher &w, int status)
307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
310 cmd_pid = 0;
311
312 if (!OPTION (Opt_hold))
313 destroy ();
314}
315
295void 316void
296rxvt_term::destroy () 317rxvt_term::destroy ()
297{ 318{
298 if (destroy_ev.active) 319 if (destroy_ev.active)
299 return; 320 return;
300 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
301#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
302 scr_overlay_off (); 325 scr_overlay_off ();
303#endif 326#endif
304 327
305 if (display) 328 if (display)
308 im_ev.stop (display); 331 im_ev.stop (display);
309#endif 332#endif
310#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
312#endif 335#endif
313#if MENUBAR 336#if TRANSPARENT || ENABLE_PERL
314 menubar_ev.stop (display);
315#endif
316#if TRANSPARENT
317 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
318#endif 338#endif
319 incr_ev.stop (); 339 incr_ev.stop ();
320 termwin_ev.stop (display); 340 termwin_ev.stop (display);
321 vt_ev.stop (display); 341 vt_ev.stop (display);
343} 363}
344 364
345void 365void
346rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
347{ 367{
348 SET_R (this); 368 make_current ();
349 369
350 delete this; 370 delete this;
351} 371}
352 372
353/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
362{ 382{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
365} 385}
366 386
367#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
368static void 388static void
369print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
370{ 390{
371 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
372 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
418{ 438{
419 if (GET_R->allowedxerror == -1) 439 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
421 else 441 else
422 { 442 {
423 //TODO: GET_R is most likely not the terminal which caused the error 443 // GET_R is most likely not the terminal which caused the error,
424 //TODO: maybe just output the error and continue? 444 // so just output the error and continue
425#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
426 print_x_error (display, event); 448 print_x_error (display, event);
427#else
428 old_xerror_handler (display, event);
429#endif 449#endif
430 } 450 }
431 451
432 return 0; 452 return 0;
433} 453}
439 DisplayString (display)); 459 DisplayString (display));
440 rxvt_emergency_cleanup (); 460 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
442} 462}
443 463
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
456}
457
458/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
459/* rxvt_init () */
460bool 465bool
461rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
462{ 467{
468 this->envv = envv;
469
463 SET_R (this); 470 SET_R (this);
464
465 set_locale (""); 471 set_locale ("");
472 set_environ (envv); // few things in X do not call setlocale :(
466 473
467 if (!init_vars ()) 474 if (!init_vars ())
468 return false; 475 return false;
469 476
470 init_secondary (); 477 init_secondary ();
473 480
474#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
475 keyboard->register_done (); 482 keyboard->register_done ();
476#endif 483#endif
477 484
478#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]);
480#endif
481#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 486 if (OPTION (Opt_scrollBar))
483 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
484#endif 488#endif
485 489
490 pty = ptytty::create ();
491
486 create_windows (argc, argv); 492 create_windows (argc, argv);
487 493
488 dDisp;
489
490 init_xlocale (); 494 init_xlocale ();
491 495
492 scr_reset (); /* initialize screen */ 496 scr_reset (); // initialize screen
493 497
494#if 0 498#if 0
495 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
496#endif 500#endif
497 501
498#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar) 503 if (OPTION (Opt_scrollBar))
500 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
501#endif 505#endif
502#if (MENUBAR_MAX)
503 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win);
505#endif
506#ifdef TRANSPARENT 506#ifdef TRANSPARENT
507 if (options & Opt_transparent) 507 if (OPTION (Opt_transparent))
508 { 508 {
509 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents (); 510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
512 } 512 }
513#endif 513#endif
514 514#if ENABLE_PERL
515 XMapWindow (disp, TermWin.vt); 515 rootwin_ev.start (display, display->root);
516 XMapWindow (disp, TermWin.parent[0]); 516#endif
517 517
518 set_colorfgbg (); 518 set_colorfgbg ();
519 519
520 init_command (cmd_argv); 520 init_command (cmd_argv);
521 521
522 free (cmd_argv); 522 free (cmd_argv);
523 523
524 if (pty->pty >= 0)
524 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
525 526
526 check_ev.start (); 527 check_ev.start ();
527 528
529 HOOK_INVOKE ((this, HOOK_START, DT_END));
530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
528 return true; 544 return true;
529} 545}
530 546
547static struct sig_handlers
548{
549 sig_watcher sw_term, sw_int;
550
551 /*
552 * Catch a fatal signal and tidy up before quitting
553 */
554 void
555 sig_term (sig_watcher &w)
556 {
557 rxvt_emergency_cleanup ();
558 signal (w.signum, SIG_DFL);
559 kill (getpid (), w.signum);
560 }
561
562 sig_handlers ()
563 : sw_term (this, &sig_handlers::sig_term),
564 sw_int (this, &sig_handlers::sig_term)
565 {
566 }
567} sig_handlers;
568
569char **rxvt_environ; // startup environment
570
531void 571void
532rxvt_init () 572rxvt_init ()
533{ 573{
534 /* 574 ptytty::init ();
535 * Save and then give up any super-user privileges 575
536 * If we need privileges in any area then we must specifically request it. 576 rxvt_environ = environ;
537 * We should only need to be root in these cases:
538 * 1. write utmp entries on some systems
539 * 2. chown tty on some systems
540 */
541 rxvt_privileges (SAVE);
542 rxvt_privileges (IGNORE);
543 577
544 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
545 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
580
581 sig_handlers.sw_term.start (SIGTERM);
582 sig_handlers.sw_int.start (SIGINT);
546 583
547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
548 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
549 586
550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss 588 // TODO: handle this with exceptions and tolerate the memory loss
552 XSetIOErrorHandler (rxvt_xioerror_handler); 589 XSetIOErrorHandler (rxvt_xioerror_handler);
553}
554 590
555/* ------------------------------------------------------------------------- * 591 XrmInitialize ();
556 * SIGNAL HANDLING & EXIT HANDLER *
557 * ------------------------------------------------------------------------- */
558/*
559 * Catch a SIGCHLD signal and exit if the direct child has died
560 */
561
562void
563rxvt_term::sig_chld (sig_watcher &w)
564{
565 // we are being called for every SIGCHLD, not just ours
566 int pid;
567
568 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
569 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
570 if (pid == (*t)->cmd_pid)
571 {
572 (*t)->destroy ();
573 break;
574 }
575} 592}
576 593
577/* ------------------------------------------------------------------------- * 594/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS * 595 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */ 596 * ------------------------------------------------------------------------- */
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 603 rxvt_fatal ("memory allocation failure. aborting.\n");
587 604
588 return p; 605 return p;
589} 606}
590 607
591/* INTPROTO */ 608void *
592void *
593rxvt_calloc (size_t number, size_t size) 609rxvt_calloc (size_t number, size_t size)
594{ 610{
595 void *p = calloc (number, size); 611 void *p = calloc (number, size);
596 612
597 if (!p) 613 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
599 615
600 return p; 616 return p;
601} 617}
602 618
603/* INTPROTO */ 619void *
604void *
605rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
606{ 621{
607 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
608 623
609 if (!p) 624 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
611 626
612 return p; 627 return p;
613} 628}
614
615/* ------------------------------------------------------------------------- *
616 * PRIVILEGED OPERATIONS *
617 * ------------------------------------------------------------------------- */
618/* take care of suid/sgid super-user (root) privileges */
619void
620rxvt_privileges (rxvt_privaction action)
621{
622#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
623 static uid_t euid;
624 static gid_t egid;
625#endif
626
627#if ! defined(__CYGWIN32__)
628# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
629 /* setreuid () is the poor man's setuid (), seteuid () */
630# define seteuid(a) setreuid(-1, (a))
631# define setegid(a) setregid(-1, (a))
632# define HAVE_SETEUID
633# endif
634# ifdef HAVE_SETEUID
635 switch (action)
636 {
637 case IGNORE:
638 /*
639 * change effective uid/gid - not real uid/gid - so we can switch
640 * back to root later, as required
641 */
642 seteuid (getuid ());
643 setegid (getgid ());
644 break;
645 case SAVE:
646 euid = geteuid ();
647 egid = getegid ();
648 break;
649 case RESTORE:
650 seteuid (euid);
651 setegid (egid);
652 break;
653 }
654# else
655 switch (action)
656 {
657 case IGNORE:
658 setuid (getuid ());
659 setgid (getgid ());
660 /* FALLTHROUGH */
661 case SAVE:
662 /* FALLTHROUGH */
663 case RESTORE:
664 break;
665 }
666# endif
667#endif
668}
669
670#ifdef UTMP_SUPPORT
671void
672rxvt_term::privileged_utmp (rxvt_privaction action)
673{
674 if ((options & Opt_utmpInhibit)
675 || !pty.name || !*pty.name)
676 return;
677
678 rxvt_privileges (RESTORE);
679
680 if (action == SAVE)
681 makeutent (pty.name, rs[Rs_display_name]);
682 else
683 cleanutent ();
684
685 rxvt_privileges (IGNORE);
686}
687#endif
688 629
689/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
690/* 631/*
691 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
692 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
693 */ 634 */
694void 635void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696{ 637{
697 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, flags;
699 unsigned int w, h; 640 unsigned int w, h;
700 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
701 dDisp;
702 642
703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
704 TermWin.ncol, TermWin.nrow, szHint.width,
705 szHint.height));
706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
707 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
708 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709 646
710 recalc_x = recalc_y = 0; 647 recalc_x = recalc_y = 0;
711 flags = 0; 648 flags = 0;
649
712 if (!parsed_geometry) 650 if (!parsed_geometry)
713 { 651 {
714 parsed_geometry = 1; 652 parsed_geometry = 1;
653
715 if (rs[Rs_geometry]) 654 if (rs[Rs_geometry])
716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 655 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
656
717 if (flags & WidthValue) 657 if (flags & WidthValue)
718 { 658 {
719 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 659 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 660 szHint.flags |= USSize;
721 } 661 }
662
722 if (flags & HeightValue) 663 if (flags & HeightValue)
723 { 664 {
724 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 665 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 666 szHint.flags |= USSize;
726 } 667 }
668
727 if (flags & XValue) 669 if (flags & XValue)
728 { 670 {
729 szHint.x = x; 671 szHint.x = x;
730 szHint.flags |= USPosition; 672 szHint.flags |= USPosition;
673
731 if (flags & XNegative) 674 if (flags & XNegative)
732 { 675 {
733 recalc_x = 1; 676 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 677 szHint.win_gravity = NorthEastGravity;
735 } 678 }
736 } 679 }
680
737 if (flags & YValue) 681 if (flags & YValue)
738 { 682 {
739 szHint.y = y; 683 szHint.y = y;
740 szHint.flags |= USPosition; 684 szHint.flags |= USPosition;
685
741 if (flags & YNegative) 686 if (flags & YNegative)
742 { 687 {
743 recalc_y = 1; 688 recalc_y = 1;
689
744 if (szHint.win_gravity == NorthEastGravity) 690 if (szHint.win_gravity == NorthEastGravity)
745 szHint.win_gravity = SouthEastGravity; 691 szHint.win_gravity = SouthEastGravity;
746 else 692 else
747 szHint.win_gravity = SouthWestGravity; 693 szHint.win_gravity = SouthWestGravity;
748 } 694 }
749 } 695 }
750 } 696 }
751 697
752 /* TODO: BOUNDS */ 698 /* TODO: BOUNDS */
753 TermWin.width = TermWin.ncol * TermWin.fwidth; 699 width = ncol * fwidth;
754 TermWin.height = TermWin.nrow * TermWin.fheight; 700 height = nrow * fheight;
755 max_width = MAX_COLS * TermWin.fwidth; 701 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * TermWin.fheight; 702 max_height = MAX_ROWS * fheight;
757 703
758 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 705
760 sb_w = mb_h = 0; 706 sb_w = 0;
761 window_vt_x = window_vt_y = TermWin.int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
762 708
763 if (scrollbar_visible ()) 709 if (scrollBar.state)
764 { 710 {
765 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
766 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
767 if (!(options & Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
768 window_vt_x += sb_w; 715 window_vt_x += sb_w;
769 } 716 }
770 717
771 if (menubar_visible ())
772 {
773 mb_h = menuBar_TotalHeight ();
774 szHint.base_height += mb_h;
775 window_vt_y += mb_h;
776 }
777
778 szHint.width_inc = TermWin.fwidth; 718 szHint.width_inc = fwidth;
779 szHint.height_inc = TermWin.fheight; 719 szHint.height_inc = fheight;
780 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
781 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
782 722
783 if (width && width - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
784 { 724 {
785 szHint.width = width; 725 szHint.width = newwidth;
786 TermWin.width = width - szHint.base_width; 726 width = newwidth - szHint.base_width;
787 } 727 }
788 else 728 else
789 { 729 {
790 MIN_IT (TermWin.width, max_width); 730 min_it (width, max_width);
791 szHint.width = szHint.base_width + TermWin.width; 731 szHint.width = szHint.base_width + width;
792 } 732 }
793 733
794 if (height && height - szHint.base_height < max_height) 734 if (newheight && newheight - szHint.base_height < max_height)
795 { 735 {
796 szHint.height = height; 736 szHint.height = newheight;
797 TermWin.height = height - szHint.base_height; 737 height = newheight - szHint.base_height;
798 } 738 }
799 else 739 else
800 { 740 {
801 MIN_IT (TermWin.height, max_height); 741 min_it (height, max_height);
802 szHint.height = szHint.base_height + TermWin.height; 742 szHint.height = szHint.base_height + height;
803 } 743 }
804 744
805 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
806 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
807 747
808 if (recalc_x) 748 if (recalc_x)
809 szHint.x += (DisplayWidth (disp, display->screen) 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
810 - szHint.width - 2 * TermWin.ext_bwidth); 750
811 if (recalc_y) 751 if (recalc_y)
812 szHint.y += (DisplayHeight (disp, display->screen) 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
813 - szHint.height - 2 * TermWin.ext_bwidth);
814 753
815 TermWin.ncol = TermWin.width / TermWin.fwidth; 754 ncol = width / fwidth;
816 TermWin.nrow = TermWin.height / TermWin.fheight; 755 nrow = height / fheight;
817 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
818 TermWin.ncol, TermWin.nrow, szHint.width,
819 szHint.height));
820 return;
821} 756}
822 757
823/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
824/* 759/*
825 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
826 * Called after a window size change. 761 * Called after a window size change.
827 */ 762 */
828void 763void
829rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
830{ 765{
831 if (pty.pty < 0) 766 if (pty->pty < 0)
832 return; 767 return;
833 768
834 struct winsize ws; 769 struct winsize ws;
835 770
836 ws.ws_col = TermWin.ncol; 771 ws.ws_col = ncol;
837 ws.ws_row = TermWin.nrow; 772 ws.ws_row = nrow;
838 ws.ws_xpixel = TermWin.width; 773 ws.ws_xpixel = width;
839 ws.ws_ypixel = TermWin.height; 774 ws.ws_ypixel = height;
840 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
841 776
842#if 0 777#if 0
843 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
844 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
845 kill (cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
846#endif 781#endif
847} 782}
848 783
849/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
850/* set_fonts () - load and set the various fonts 785/* set_fonts () - load and set the various fonts
851/* 786 *
852 * init = 1 - initialize 787 * init = 1 - initialize
853 * 788 *
854 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
855 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
856 */ 791 */
868 return false; 803 return false;
869 } 804 }
870 805
871#if ENABLE_STYLES 806#if ENABLE_STYLES
872 for (int i = RS_styleCount; --i; ) 807 for (int i = RS_styleCount; --i; )
873 if (TermWin.fontset[i] != TermWin.fontset[0]) 808 if (fontset[i] != fontset[0])
874 delete TermWin.fontset[i]; 809 delete fontset[i];
875#endif 810#endif
876 811
877 delete TermWin.fontset[0]; 812 delete fontset[0];
878 TermWin.fontset[0] = fs; 813 fontset[0] = fs;
879 814
880 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
881 prop.height += TermWin.lineSpace; 816 prop.height += lineSpace;
882 fs->set_prop (prop); 817 fs->set_prop (prop);
883 818
884 TermWin.fwidth = prop.width; 819 fwidth = prop.width;
885 TermWin.fheight = prop.height; 820 fheight = prop.height;
886 TermWin.fweight = prop.weight; 821 fbase = prop.ascent;
887 TermWin.fslant = prop.slant;
888 TermWin.fbase = (*fs)[1]->ascent;
889 822
890 for (int style = 1; style < 4; style++) 823 for (int style = 1; style < 4; style++)
891 { 824 {
892#if ENABLE_STYLES 825#if ENABLE_STYLES
893 const char *res = rs[Rs_font + style]; 826 const char *res = rs[Rs_font + style];
894 827
895 if (res && !*res) 828 if (res && !*res)
896 TermWin.fontset[style] = TermWin.fontset[0]; 829 fontset[style] = fontset[0];
897 else 830 else
898 { 831 {
899 TermWin.fontset[style] = fs = new rxvt_fontset (this); 832 fontset[style] = fs = new rxvt_fontset (this);
900 rxvt_fontprop prop2 = prop; 833 rxvt_fontprop prop2 = prop;
901 834
902 if (res) 835 if (res)
903 prop2.weight = prop2.slant = rxvt_fontprop::unset; 836 prop2.weight = prop2.slant = rxvt_fontprop::unset;
904 else 837 else
905 { 838 {
906 res = TermWin.fontset[0]->fontdesc; 839 res = fontset[0]->fontdesc;
907 840
908 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 841 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
909 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 842 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
910 } 843 }
911 844
912 fs->populate (res); 845 fs->populate (res);
913 fs->set_prop (prop2); 846 fs->set_prop (prop2);
914 } 847 }
915#else 848#else
916 TermWin.fontset[style] = TermWin.fontset[0]; 849 fontset[style] = fontset[0];
917#endif 850#endif
918 } 851 }
919 852
920 if (TermWin.parent[0]) 853 if (parent[0])
921 { 854 {
922 resize_all_windows (0, 0, 0); 855 resize_all_windows (0, 0, 0);
923 scr_remap_chars (); 856 scr_remap_chars ();
924 scr_touch (true); 857 scr_touch (true);
925 } 858 }
927 return true; 860 return true;
928} 861}
929 862
930void rxvt_term::set_string_property (Atom prop, const char *str, int len) 863void rxvt_term::set_string_property (Atom prop, const char *str, int len)
931{ 864{
932 // TODO: SMART_WINDOW_TITLE
933 XChangeProperty (display->display, TermWin.parent[0], 865 XChangeProperty (dpy, parent[0],
934 prop, XA_STRING, 8, PropModeReplace, 866 prop, XA_STRING, 8, PropModeReplace,
935 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 867 (const unsigned char *)str, len >= 0 ? len : strlen (str));
936} 868}
937 869
938void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
939{ 871{
940 // TODO: SMART_WINDOW_TITLE
941 wchar_t *ws = rxvt_mbstowcs (str, len); 872 wchar_t *ws = rxvt_mbstowcs (str, len);
942 char *s = rxvt_wcstoutf8 (ws); 873 char *s = rxvt_wcstoutf8 (ws);
943 874
944 XChangeProperty (display->display, TermWin.parent[0], 875 XChangeProperty (dpy, parent[0],
945 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 876 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
946 (const unsigned char *)s, strlen (s)); 877 (const unsigned char *)s, strlen (s));
947 878
948 free (s); 879 free (s);
949 free (ws); 880 free (ws);
954/* xterm sequences - title, iconName, color (exptl) */ 885/* xterm sequences - title, iconName, color (exptl) */
955void 886void
956rxvt_term::set_title (const char *str) 887rxvt_term::set_title (const char *str)
957{ 888{
958 set_string_property (XA_WM_NAME, str); 889 set_string_property (XA_WM_NAME, str);
959#if ENABLE_FRILLS 890#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_NAME], str); 891 set_utf8_property (xa[XA_NET_WM_NAME], str);
961#endif 892#endif
962} 893}
963 894
964void 895void
965rxvt_term::set_icon_name (const char *str) 896rxvt_term::set_icon_name (const char *str)
966{ 897{
967 set_string_property (XA_WM_ICON_NAME, str); 898 set_string_property (XA_WM_ICON_NAME, str);
968#if ENABLE_FRILLS 899#if ENABLE_EWMH
969 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 900 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
970#endif 901#endif
971} 902}
972 903
973#ifdef XTERM_COLOR_CHANGE 904#ifdef XTERM_COLOR_CHANGE
974void 905void
975rxvt_term::set_window_color (int idx, const char *color) 906rxvt_term::set_window_color (int idx, const char *color)
976{ 907{
977 rxvt_color xcol; 908 rxvt_color xcol;
978 int i; 909 int i;
979 910
980 if (color == NULL || *color == '\0') 911 if (color == NULL || *color == '\0')
981 return; 912 return;
913
914 color = strdup (color);
915 allocated.push_back ((void *)color);
916 rs[Rs_color + idx] = color;
982 917
983 /* handle color aliases */ 918 /* handle color aliases */
984 if (isdigit (*color)) 919 if (isdigit (*color))
985 { 920 {
986 i = atoi (color); 921 i = atoi (color);
987 922
988 if (i >= 8 && i <= 15) 923 if (i >= 8 && i <= 15)
989 { /* bright colors */ 924 { /* bright colors */
990 i -= 8; 925 i -= 8;
991# ifndef NO_BRIGHTCOLOR
992 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
993 SET_PIXCOLOR (idx);
994 goto Done; 927 goto done;
995# endif
996 } 928 }
997 929
998 if (i >= 0 && i <= 7) 930 if (i >= 0 && i <= 7)
999 { /* normal colors */ 931 { /* normal colors */
1000 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1001 SET_PIXCOLOR (idx);
1002 goto Done; 933 goto done;
1003 } 934 }
1004 } 935 }
1005 936
1006 if (!rXParseAllocColor (&xcol, color)) 937 set_color (xcol, color);
1007 return;
1008
1009 /* XStoreColor (display->display, display->cmap, XColor*); */
1010 938
1011 /* 939 /*
1012 * FIXME: should free colors here, but no idea how to do it so instead, 940 * FIXME: should free colors here, but no idea how to do it so instead,
1013 * so just keep gobbling up the colormap 941 * so just keep gobbling up the colormap
1014 */ 942 */
1015# if 0
1016 for (i = Color_Black; i <= Color_White; i++)
1017 if (pix_colors[idx] == pix_colors[i])
1018 break;
1019 if (i > Color_White)
1020 {
1021 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1022 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1023 DisplayPlanes (display->display, display->screen));
1024 }
1025# endif
1026 943
1027 pix_colors_focused[idx] = xcol; 944 pix_colors_focused[idx] = xcol;
1028 SET_PIXCOLOR (idx);
1029 945
1030 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
1031 /* Cursor cursor; */ 947 /* Cursor cursor; */
1032Done: 948done:
1033#ifdef OFF_FOCUS_FADING
1034 if (rs[Rs_fade])
1035 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1036#endif
1037
1038 /*TODO: handle Color_BD, scrollbar background, etc. */ 949 /*TODO: handle Color_BD, scrollbar background, etc. */
1039 950
951 update_fade_color (idx);
1040 recolour_cursor (); 952 recolour_cursor ();
1041 scr_recolour (); 953 scr_recolour ();
1042} 954}
1043 955
1044#else 956#else
1046#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1047 959
1048void 960void
1049rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1050{ 962{
1051 XColor xcol[2]; 963 XColor fg, bg;
1052 964
1053 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1054 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1055 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1056 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1057 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1058 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1059 972
1060 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1061 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1062} 974}
1063 975
1064/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1065/* 977/*
1066 * 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
1070{ 982{
1071 unsigned int i; 983 unsigned int i;
1072 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1073 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1074 986
1075 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1076 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1077 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1078 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1079 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1080 { 991 {
1095 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1096} 1007}
1097 1008
1098/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1099 1010
1100int 1011bool
1101rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1102{ 1013{
1103 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1104 {
1105 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1106 return false;
1107 }
1108
1109 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1110} 1025}
1111 1026
1112/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1113 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1114 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1115void 1030void
1116rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1117{ 1032{
1118 int fix_screen; 1033 int fix_screen;
1119#ifdef SMART_RESIZE 1034 int old_width = szHint.width;
1120 int old_width = szHint.width, old_height = szHint.height; 1035 int old_height = szHint.height;
1121#endif
1122 dDisp;
1123 1036
1124 window_calc (width, height); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1125 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1126 1041
1127 if (!ignoreparent) 1042 if (!ignoreparent)
1128 { 1043 {
1129#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1130 /* 1045 /*
1134 int x, y, x1, y1; 1049 int x, y, x1, y1;
1135 int dx, dy; 1050 int dx, dy;
1136 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1137 Window unused_cr; 1052 Window unused_cr;
1138 1053
1139 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1140 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1141 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1142 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1143 /* 1058 /*
1144 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1145 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1146 */ 1061 */
1148 { 1063 {
1149 x -= x1; 1064 x -= x1;
1150 y -= y1; 1065 y -= y1;
1151 } 1066 }
1152 1067
1153 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1154 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1155 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1156 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1157 1072
1158 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1159 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1160 dx = 0; 1075 dx = 0;
1163 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1164 dy = 0; 1079 dy = 0;
1165 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1166 dy /= 2; 1081 dy /= 2;
1167 1082
1168 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1169 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1170#else 1085#else
1171 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1172#endif 1087#endif
1173 } 1088 }
1174 1089
1175 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1176 1091
1177 if (fix_screen || width != old_width || height != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1178 { 1093 {
1179 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1180 { 1095 {
1181 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1182 window_sb_x, 0, 1097 window_sb_x, 0,
1183 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1184 resize_scrollbar (); 1099 resize_scrollbar ();
1185 } 1100 }
1186 1101
1187 if (menubar_visible ())
1188 XMoveResizeWindow (disp, menuBar.win,
1189 window_vt_x, 0,
1190 TermWin_TotalWidth (), menuBar_TotalHeight ());
1191
1192 XMoveResizeWindow (disp, TermWin.vt, 1102 XMoveResizeWindow (dpy, vt,
1193 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1194 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1104 width, height);
1195 1105
1196 scr_clear (); 1106 scr_clear ();
1197#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1198 resize_pixmap (); 1108 resize_pixmap ();
1199#endif 1109#endif
1200 } 1110 }
1201 1111
1202 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1203 {
1204 int curr_screen = -1;
1205 int old_ncol = prev_ncol;
1206
1207 /* scr_reset only works on the primary screen */
1208 if (old_height) /* this is not the first time through */
1209 {
1210 unsigned int ncol = TermWin.ncol;
1211 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1212 curr_screen = scr_change_screen (PRIMARY);
1213 TermWin.ncol = ncol;
1214 }
1215
1216 scr_reset (); 1113 scr_reset ();
1217 1114
1218 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1219 { 1116 //scr_touch (false);
1220 scr_change_screen (curr_screen);
1221 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1222 }
1223 }
1224
1225 old_width = szHint.width;
1226 old_height = szHint.height;
1227 1117
1228#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1229 if (TermWin.pixmap) 1119 if (pixmap)
1230 scr_touch (false); 1120 scr_touch (false);
1231#endif 1121#endif
1232 1122
1233#ifdef USE_XIM 1123#ifdef USE_XIM
1234 IMSetStatusPosition (); 1124 IMSetPosition ();
1235#endif 1125#endif
1236} 1126}
1237 1127
1238/* 1128/*
1239 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
1240 * good for toggling 80/132 columns 1130 * good for toggling 80/132 columns
1241 */ 1131 */
1242void 1132void
1243rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1133rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1244{ 1134{
1245 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1246 1136
1247 if (width == 0 || height == 0) 1137 if (newwidth == 0 || newheight == 0)
1248 { 1138 {
1249 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1140
1250 if (width == 0) 1141 if (newwidth == 0)
1251 width = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1252 if (height == 0) 1143 if (newheight == 0)
1253 height = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
1254 }
1255
1256 if (width != TermWin.width || height != TermWin.height)
1257 { 1145 }
1146
1147 if (newwidth != width || newheight != height)
1148 {
1258 width += szHint.base_width; 1149 newwidth += szHint.base_width;
1259 height += szHint.base_height; 1150 newheight += szHint.base_height;
1260 resize_all_windows (width, height, 0); 1151 resize_all_windows (newwidth, newheight, 0);
1261 } 1152 }
1262} 1153}
1263 1154
1264/* -------------------------------------------------------------------- * 1155/* -------------------------------------------------------------------- *
1265 * - X INPUT METHOD ROUTINES - * 1156 * - X INPUT METHOD ROUTINES - *
1267#ifdef USE_XIM 1158#ifdef USE_XIM
1268 1159
1269void 1160void
1270rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1271{ 1162{
1272 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1273 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1274} 1165}
1275 1166
1276void 1167void
1277rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1278{ 1169{
1279 // the int_bwidth terms make no sense to me 1170 // the int_bwidth terms make no sense to me
1280 size.x = TermWin.int_bwidth; 1171 size.x = int_bwidth;
1281 size.y = TermWin.int_bwidth; 1172 size.y = int_bwidth;
1282 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1173 size.width = Width2Pixel (ncol) + int_bwidth;
1283 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1174 size.height = Height2Pixel (nrow) + int_bwidth;
1284} 1175}
1285 1176
1286void 1177void
1287rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1178rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1288 XRectangle &status_rect, 1179 XRectangle &status_rect,
1289 const XRectangle &needed_rect) 1180 const XRectangle &needed_rect)
1290{ 1181{
1291 preedit_rect.x = needed_rect.width; 1182 preedit_rect.x = needed_rect.width;
1292 preedit_rect.y = 0; 1183 preedit_rect.y = 0;
1293 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1184 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1294 preedit_rect.height = TermWin.fheight; 1185 preedit_rect.height = fheight;
1295 1186
1296 status_rect.x = 0; 1187 status_rect.x = 0;
1297 status_rect.y = 0; 1188 status_rect.y = 0;
1298 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1189 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1299 status_rect.height = TermWin.fheight; 1190 status_rect.height = fheight;
1300} 1191}
1301 1192
1302/* Checking whether input method is running. */ 1193/* Checking whether input method is running. */
1303bool 1194bool
1304rxvt_term::IMisRunning () 1195rxvt_term::IMisRunning ()
1315 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1316 1207
1317 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1318 *p = '\0'; 1209 *p = '\0';
1319 1210
1320 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1321 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1322 1213
1323 if (win != None) 1214 if (win != None)
1324 return True; 1215 return True;
1325 } 1216 }
1326 1217
1332{ 1223{
1333 XPoint nspot; 1224 XPoint nspot;
1334 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1335 1226
1336 if (!Input_Context 1227 if (!Input_Context
1337 || !TermWin.focus 1228 || !focus
1338 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1339 return; 1230 return;
1340 1231
1341 im_set_position (nspot); 1232 im_set_position (nspot);
1342 1233
1343 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
1362 input_method = 0; 1253 input_method = 0;
1363 } 1254 }
1364 1255
1365 Input_Context = 0; 1256 Input_Context = 0;
1366} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
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_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1367 1332
1368/* 1333/*
1369 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1370 * open a suitable preedit type 1335 * open a suitable preedit type
1371 */ 1336 */
1378 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1379 unsigned long fg, bg; 1344 unsigned long fg, bg;
1380 const char *p; 1345 const char *p;
1381 char **s; 1346 char **s;
1382 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1351
1352 set_environ (envv);
1383 1353
1384 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1385 return false; 1355 return false;
1386 1356
1387 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1388 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1389 if (input_method == NULL) 1358 if (input_method == NULL)
1390 return false; 1359 return false;
1391 1360
1392 xim = input_method->xim; 1361 xim = input_method->xim;
1412 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1413 1382
1414 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1415 { 1384 {
1416 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1417 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1418 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1419 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1420 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1421 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1422 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1423 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1424 1399
1425 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1426 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1427 { 1402 {
1428 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
1462 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1437 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1463 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1438 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1439 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1440 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "*", 1441 "*",
1467 TermWin.fheight, 1442 fheight,
1468 TermWin.fheight + 1, TermWin.fheight - 1, 1443 fheight + 1, fheight - 1,
1469 TermWin.fheight - 2, TermWin.fheight + 2); 1444 fheight - 2, fheight + 2);
1470 1445
1471 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1472 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1473 1448
1474 if (missing_charset_list) 1449 if (missing_charset_list)
1475 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1476 1451
1517 XNBackground, bg, 1492 XNBackground, bg,
1518 XNArea, &status_rect, 1493 XNArea, &status_rect,
1519 XNFontSet, fs, 1494 XNFontSet, fs,
1520 NULL); 1495 NULL);
1521 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1522 1520
1523 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1524 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1525 XNClientWindow, TermWin.vt, 1523 XNClientWindow, vt,
1526 XNFocusWindow, TermWin.parent[0], 1524 XNFocusWindow, parent[0],
1527 preedit_attr ? XNPreeditAttributes : NULL, 1525 preedit_attr ? XNPreeditAttributes : NULL,
1528 preedit_attr, 1526 preedit_attr,
1529 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1530 status_attr, NULL); 1528 status_attr, NULL);
1531 1529
1532 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1533 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1534 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1535 1533
1536 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1537 { 1535 {
1538 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1539 im_destroy (); 1537 im_destroy ();
1540 return false; 1538 return false;
1541 } 1539 }
1542 1540
1543 if (input_style & XIMPreeditArea) 1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1544 IMSetStatusPosition (); 1547 IMSetPosition ();
1545 1548
1546 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1547 return true; 1549 return true;
1548} 1550}
1549 1551
1550void 1552void
1551rxvt_term::im_cb () 1553rxvt_term::im_cb ()
1552{ 1554{
1553 int i, found, had_im; 1555 int i;
1554 const char *p; 1556 const char *p;
1555 char **s; 1557 char **s;
1556 char buf[IMBUFSIZ]; 1558 char buf[IMBUFSIZ];
1557 1559
1558 SET_R (this); 1560 make_current ();
1559 1561
1560 im_destroy (); 1562 im_destroy ();
1561 1563
1562 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1563 if (Input_Context) 1564 if (Input_Context)
1564 return; 1565 return;
1565 1566
1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1567 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
1609 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1610#endif 1611#endif
1611} 1612}
1612 1613
1613void 1614void
1614rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1615{ 1616{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1618 1619
1619 if (!Input_Context 1620 if (!Input_Context
1620 || !TermWin.focus 1621 || !focus
1621 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1623 || !IMisRunning ())
1623 return; 1624 return;
1624 1625
1626 if (input_style & XIMPreeditPosition)
1627 {
1628 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630
1631 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL);
1633 }
1634 else
1635 {
1625 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1627 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1628 XFree (status_attr); 1639 XFree (status_attr);
1629 1640
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1642 XFree (needed_rect);
1632 1643
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1646
1636 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1639 1651
1652 XFree (status_attr);
1653 }
1654
1640 XFree (preedit_attr); 1655 XFree (preedit_attr);
1641 XFree (status_attr);
1642} 1656}
1643#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1644 1658
1645/*----------------------------------------------------------------------*/
1646rxvt_t rxvt_current_term;
1647
1648/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines