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.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.230 by root, Sun Aug 27 10:10:25 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 size = strlen (locale) + 1;
62
63 if (size > 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, size))
60 return false; 67 return false;
61 68
62 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
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] && !rs[Rs_embed]) 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 }
263 271
272 clear ();
273 }
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
271 scr_release (); 282 scr_release ();
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);
717 656
718 if (flags & WidthValue) 657 if (flags & WidthValue)
719 { 658 {
720 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 659 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 660 szHint.flags |= USSize;
722 } 661 }
723 662
724 if (flags & HeightValue) 663 if (flags & HeightValue)
725 { 664 {
726 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 665 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
727 szHint.flags |= USSize; 666 szHint.flags |= USSize;
728 } 667 }
729 668
730 if (flags & XValue) 669 if (flags & XValue)
731 { 670 {
732 szHint.x = x; 671 szHint.x = x;
733 szHint.flags |= USPosition; 672 szHint.flags |= USPosition;
673
734 if (flags & XNegative) 674 if (flags & XNegative)
735 { 675 {
736 recalc_x = 1; 676 recalc_x = 1;
737 szHint.win_gravity = NorthEastGravity; 677 szHint.win_gravity = NorthEastGravity;
738 } 678 }
740 680
741 if (flags & YValue) 681 if (flags & YValue)
742 { 682 {
743 szHint.y = y; 683 szHint.y = y;
744 szHint.flags |= USPosition; 684 szHint.flags |= USPosition;
685
745 if (flags & YNegative) 686 if (flags & YNegative)
746 { 687 {
747 recalc_y = 1; 688 recalc_y = 1;
689
748 if (szHint.win_gravity == NorthEastGravity) 690 if (szHint.win_gravity == NorthEastGravity)
749 szHint.win_gravity = SouthEastGravity; 691 szHint.win_gravity = SouthEastGravity;
750 else 692 else
751 szHint.win_gravity = SouthWestGravity; 693 szHint.win_gravity = SouthWestGravity;
752 } 694 }
753 } 695 }
754 } 696 }
755 697
756 /* TODO: BOUNDS */ 698 /* TODO: BOUNDS */
757 TermWin.width = TermWin.ncol * TermWin.fwidth; 699 width = ncol * fwidth;
758 TermWin.height = TermWin.nrow * TermWin.fheight; 700 height = nrow * fheight;
759 max_width = MAX_COLS * TermWin.fwidth; 701 max_width = MAX_COLS * fwidth;
760 max_height = MAX_ROWS * TermWin.fheight; 702 max_height = MAX_ROWS * fheight;
761 703
762 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
763 705
764 sb_w = mb_h = 0; 706 sb_w = 0;
765 window_vt_x = window_vt_y = TermWin.int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
766 708
767 if (scrollbar_visible ()) 709 if (scrollBar.state)
768 { 710 {
769 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
770 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
771 if (!(options & Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
772 window_vt_x += sb_w; 715 window_vt_x += sb_w;
773 } 716 }
774 717
775 if (menubar_visible ())
776 {
777 mb_h = menuBar_TotalHeight ();
778 szHint.base_height += mb_h;
779 window_vt_y += mb_h;
780 }
781
782 szHint.width_inc = TermWin.fwidth; 718 szHint.width_inc = fwidth;
783 szHint.height_inc = TermWin.fheight; 719 szHint.height_inc = fheight;
784 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
785 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
786 722
787 if (width && width - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
788 { 724 {
789 szHint.width = width; 725 szHint.width = newwidth;
790 TermWin.width = width - szHint.base_width; 726 width = newwidth - szHint.base_width;
791 } 727 }
792 else 728 else
793 { 729 {
794 MIN_IT (TermWin.width, max_width); 730 min_it (width, max_width);
795 szHint.width = szHint.base_width + TermWin.width; 731 szHint.width = szHint.base_width + width;
796 } 732 }
797 733
798 if (height && height - szHint.base_height < max_height) 734 if (newheight && newheight - szHint.base_height < max_height)
799 { 735 {
800 szHint.height = height; 736 szHint.height = newheight;
801 TermWin.height = height - szHint.base_height; 737 height = newheight - szHint.base_height;
802 } 738 }
803 else 739 else
804 { 740 {
805 MIN_IT (TermWin.height, max_height); 741 min_it (height, max_height);
806 szHint.height = szHint.base_height + TermWin.height; 742 szHint.height = szHint.base_height + height;
807 } 743 }
808 744
809 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
810 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
811 747
812 if (recalc_x) 748 if (recalc_x)
813 szHint.x += (DisplayWidth (disp, display->screen) 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
814 - szHint.width - 2 * TermWin.ext_bwidth); 750
815 if (recalc_y) 751 if (recalc_y)
816 szHint.y += (DisplayHeight (disp, display->screen) 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
817 - szHint.height - 2 * TermWin.ext_bwidth);
818 753
819 TermWin.ncol = TermWin.width / TermWin.fwidth; 754 ncol = width / fwidth;
820 TermWin.nrow = TermWin.height / TermWin.fheight; 755 nrow = height / fheight;
821 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
822 TermWin.ncol, TermWin.nrow, szHint.width,
823 szHint.height));
824 return;
825} 756}
826 757
827/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
828/* 759/*
829 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
830 * Called after a window size change. 761 * Called after a window size change.
831 */ 762 */
832void 763void
833rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
834{ 765{
835 if (pty.pty < 0) 766 if (pty->pty < 0)
836 return; 767 return;
837 768
838 struct winsize ws; 769 struct winsize ws;
839 770
840 ws.ws_col = TermWin.ncol; 771 ws.ws_col = ncol;
841 ws.ws_row = TermWin.nrow; 772 ws.ws_row = nrow;
842 ws.ws_xpixel = TermWin.width; 773 ws.ws_xpixel = width;
843 ws.ws_ypixel = TermWin.height; 774 ws.ws_ypixel = height;
844 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
845 776
846#if 0 777#if 0
847 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
848 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
849 kill (cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
850#endif 781#endif
851} 782}
852 783
853/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
854/* set_fonts () - load and set the various fonts 785/* set_fonts () - load and set the various fonts
855/* 786 *
856 * init = 1 - initialize 787 * init = 1 - initialize
857 * 788 *
858 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
859 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
860 */ 791 */
872 return false; 803 return false;
873 } 804 }
874 805
875#if ENABLE_STYLES 806#if ENABLE_STYLES
876 for (int i = RS_styleCount; --i; ) 807 for (int i = RS_styleCount; --i; )
877 if (TermWin.fontset[i] != TermWin.fontset[0]) 808 if (fontset[i] != fontset[0])
878 delete TermWin.fontset[i]; 809 delete fontset[i];
879#endif 810#endif
880 811
881 delete TermWin.fontset[0]; 812 delete fontset[0];
882 TermWin.fontset[0] = fs; 813 fontset[0] = fs;
883 814
884 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
885 prop.height += TermWin.lineSpace; 816 prop.height += lineSpace;
817
886 fs->set_prop (prop); 818 fs->set_prop (prop, false);
887 819
888 TermWin.fwidth = prop.width; 820 fwidth = prop.width;
889 TermWin.fheight = prop.height; 821 fheight = prop.height;
890 TermWin.fweight = prop.weight; 822 fbase = prop.ascent;
891 TermWin.fslant = prop.slant;
892 TermWin.fbase = (*fs)[1]->ascent;
893 823
894 for (int style = 1; style < 4; style++) 824 for (int style = 1; style < 4; style++)
895 { 825 {
896#if ENABLE_STYLES 826#if ENABLE_STYLES
897 const char *res = rs[Rs_font + style]; 827 const char *res = rs[Rs_font + style];
898 828
899 if (res && !*res) 829 if (res && !*res)
900 TermWin.fontset[style] = TermWin.fontset[0]; 830 fontset[style] = fontset[0];
901 else 831 else
902 { 832 {
903 TermWin.fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
904 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
905 835
906 if (res) 836 if (res)
907 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 prop2.weight = prop2.slant = rxvt_fontprop::unset;
908 else 838 else
909 { 839 {
910 res = TermWin.fontset[0]->fontdesc; 840 res = fontset[0]->fontdesc;
911 841
912 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 842 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
913 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 843 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
914 } 844 }
915 845
916 fs->populate (res); 846 fs->populate (res);
917 fs->set_prop (prop2); 847 fs->set_prop (prop2, true);
918 } 848 }
919#else 849#else
920 TermWin.fontset[style] = TermWin.fontset[0]; 850 fontset[style] = fontset[0];
921#endif 851#endif
922 } 852 }
923 853
924 if (TermWin.parent[0]) 854 if (parent[0])
925 { 855 {
926 resize_all_windows (0, 0, 0); 856 resize_all_windows (0, 0, 0);
927 scr_remap_chars (); 857 scr_remap_chars ();
928 scr_touch (true); 858 scr_touch (true);
929 } 859 }
931 return true; 861 return true;
932} 862}
933 863
934void rxvt_term::set_string_property (Atom prop, const char *str, int len) 864void rxvt_term::set_string_property (Atom prop, const char *str, int len)
935{ 865{
936 // TODO: SMART_WINDOW_TITLE
937 XChangeProperty (display->display, TermWin.parent[0], 866 XChangeProperty (dpy, parent[0],
938 prop, XA_STRING, 8, PropModeReplace, 867 prop, XA_STRING, 8, PropModeReplace,
939 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 868 (const unsigned char *)str, len >= 0 ? len : strlen (str));
940} 869}
941 870
942void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 871void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
943{ 872{
944 // TODO: SMART_WINDOW_TITLE
945 wchar_t *ws = rxvt_mbstowcs (str, len); 873 wchar_t *ws = rxvt_mbstowcs (str, len);
946 char *s = rxvt_wcstoutf8 (ws); 874 char *s = rxvt_wcstoutf8 (ws);
947 875
948 XChangeProperty (display->display, TermWin.parent[0], 876 XChangeProperty (dpy, parent[0],
949 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 877 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
950 (const unsigned char *)s, strlen (s)); 878 (const unsigned char *)s, strlen (s));
951 879
952 free (s); 880 free (s);
953 free (ws); 881 free (ws);
958/* xterm sequences - title, iconName, color (exptl) */ 886/* xterm sequences - title, iconName, color (exptl) */
959void 887void
960rxvt_term::set_title (const char *str) 888rxvt_term::set_title (const char *str)
961{ 889{
962 set_string_property (XA_WM_NAME, str); 890 set_string_property (XA_WM_NAME, str);
963#if ENABLE_FRILLS 891#if ENABLE_EWMH
964 set_utf8_property (xa[XA_NET_WM_NAME], str); 892 set_utf8_property (xa[XA_NET_WM_NAME], str);
965#endif 893#endif
966} 894}
967 895
968void 896void
969rxvt_term::set_icon_name (const char *str) 897rxvt_term::set_icon_name (const char *str)
970{ 898{
971 set_string_property (XA_WM_ICON_NAME, str); 899 set_string_property (XA_WM_ICON_NAME, str);
972#if ENABLE_FRILLS 900#if ENABLE_EWMH
973 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 901 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
974#endif 902#endif
975} 903}
976 904
977#ifdef XTERM_COLOR_CHANGE 905#ifdef XTERM_COLOR_CHANGE
978void 906void
979rxvt_term::set_window_color (int idx, const char *color) 907rxvt_term::set_window_color (int idx, const char *color)
980{ 908{
981 rxvt_color xcol; 909 rxvt_color xcol;
982 int i; 910 int i;
983 911
984 if (color == NULL || *color == '\0') 912 if (color == NULL || *color == '\0')
985 return; 913 return;
914
915 color = strdup (color);
916 allocated.push_back ((void *)color);
917 rs[Rs_color + idx] = color;
986 918
987 /* handle color aliases */ 919 /* handle color aliases */
988 if (isdigit (*color)) 920 if (isdigit (*color))
989 { 921 {
990 i = atoi (color); 922 i = atoi (color);
991 923
992 if (i >= 8 && i <= 15) 924 if (i >= 8 && i <= 15)
993 { /* bright colors */ 925 { /* bright colors */
994 i -= 8; 926 i -= 8;
995# ifndef NO_BRIGHTCOLOR
996 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 927 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
997 SET_PIXCOLOR (idx);
998 goto Done; 928 goto done;
999# endif
1000 } 929 }
1001 930
1002 if (i >= 0 && i <= 7) 931 if (i >= 0 && i <= 7)
1003 { /* normal colors */ 932 { /* normal colors */
1004 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1005 SET_PIXCOLOR (idx);
1006 goto Done; 934 goto done;
1007 } 935 }
1008 } 936 }
1009 937
1010 if (!rXParseAllocColor (&xcol, color)) 938 set_color (xcol, color);
1011 return;
1012
1013 /* XStoreColor (display->display, display->cmap, XColor*); */
1014 939
1015 /* 940 /*
1016 * FIXME: should free colors here, but no idea how to do it so instead, 941 * FIXME: should free colors here, but no idea how to do it so instead,
1017 * so just keep gobbling up the colormap 942 * so just keep gobbling up the colormap
1018 */ 943 */
1019# if 0
1020 for (i = Color_Black; i <= Color_White; i++)
1021 if (pix_colors[idx] == pix_colors[i])
1022 break;
1023 if (i > Color_White)
1024 {
1025 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1026 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1027 DisplayPlanes (display->display, display->screen));
1028 }
1029# endif
1030 944
1031 pix_colors_focused[idx] = xcol; 945 pix_colors_focused[idx] = xcol;
1032 SET_PIXCOLOR (idx);
1033 946
1034 /* XSetWindowAttributes attr; */ 947 /* XSetWindowAttributes attr; */
1035 /* Cursor cursor; */ 948 /* Cursor cursor; */
1036Done: 949done:
1037#ifdef OFF_FOCUS_FADING
1038 if (rs[Rs_fade])
1039 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1040#endif
1041
1042 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1043 951
952 update_fade_color (idx);
1044 recolour_cursor (); 953 recolour_cursor ();
1045 scr_recolour (); 954 scr_recolour ();
1046} 955}
1047 956
1048#else 957#else
1050#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1051 960
1052void 961void
1053rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1054{ 963{
1055 XColor xcol[2]; 964 XColor fg, bg;
1056 965
1057 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1058 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1059 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1060 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1061 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1062 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1063 973
1064 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1065 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1066} 975}
1067 976
1068/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1069/* 978/*
1070 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
1074{ 983{
1075 unsigned int i; 984 unsigned int i;
1076 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1077 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1078 987
1079 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1080 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1081 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1082 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1083 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1084 { 992 {
1099 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1100} 1008}
1101 1009
1102/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1103 1011
1104int 1012bool
1105rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1106{ 1014{
1107 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1108 {
1109 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1110 return false;
1111 }
1112
1113 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1114} 1026}
1115 1027
1116/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1117 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1118 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1119void 1031void
1120rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1121{ 1033{
1122 int fix_screen; 1034 int fix_screen;
1123#ifdef SMART_RESIZE 1035 int old_width = szHint.width;
1124 int old_width = szHint.width, old_height = szHint.height; 1036 int old_height = szHint.height;
1125#endif
1126 dDisp;
1127 1037
1128 window_calc (width, height); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1129 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1130 1042
1131 if (!ignoreparent) 1043 if (!ignoreparent)
1132 { 1044 {
1133#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1134 /* 1046 /*
1138 int x, y, x1, y1; 1050 int x, y, x1, y1;
1139 int dx, dy; 1051 int dx, dy;
1140 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1141 Window unused_cr; 1053 Window unused_cr;
1142 1054
1143 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1144 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1145 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1146 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1147 /* 1059 /*
1148 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1149 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1150 */ 1062 */
1152 { 1064 {
1153 x -= x1; 1065 x -= x1;
1154 y -= y1; 1066 y -= y1;
1155 } 1067 }
1156 1068
1157 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1158 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1159 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1160 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1161 1073
1162 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1163 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1164 dx = 0; 1076 dx = 0;
1167 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1168 dy = 0; 1080 dy = 0;
1169 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1170 dy /= 2; 1082 dy /= 2;
1171 1083
1172 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1173 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1174#else 1086#else
1175 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1176#endif 1088#endif
1177 } 1089 }
1178 1090
1179 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1180 1092
1181 if (fix_screen || width != old_width || height != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1182 { 1094 {
1183 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1184 { 1096 {
1185 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1186 window_sb_x, 0, 1098 window_sb_x, 0,
1187 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1188 resize_scrollbar (); 1100 resize_scrollbar ();
1189 } 1101 }
1190 1102
1191 if (menubar_visible ())
1192 XMoveResizeWindow (disp, menuBar.win,
1193 window_vt_x, 0,
1194 TermWin_TotalWidth (), menuBar_TotalHeight ());
1195
1196 XMoveResizeWindow (disp, TermWin.vt, 1103 XMoveResizeWindow (dpy, vt,
1197 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1198 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1105 width, height);
1199 1106
1200 scr_clear (); 1107 scr_clear ();
1201#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1202 resize_pixmap (); 1109 resize_pixmap ();
1203#endif 1110#endif
1204 } 1111 }
1205 1112
1206 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1207 {
1208 int curr_screen = -1;
1209 int old_ncol = prev_ncol;
1210
1211 /* scr_reset only works on the primary screen */
1212 if (old_height) /* this is not the first time through */
1213 {
1214 unsigned int ncol = TermWin.ncol;
1215 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1216 curr_screen = scr_change_screen (PRIMARY);
1217 TermWin.ncol = ncol;
1218 }
1219
1220 scr_reset (); 1114 scr_reset ();
1221 1115
1222 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1223 { 1117 //scr_touch (false);
1224 scr_change_screen (curr_screen);
1225 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1226 }
1227 }
1228
1229 old_width = szHint.width;
1230 old_height = szHint.height;
1231 1118
1232#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1233 if (TermWin.pixmap) 1120 if (pixmap)
1234 scr_touch (false); 1121 scr_touch (false);
1235#endif 1122#endif
1236 1123
1237#ifdef USE_XIM 1124#ifdef USE_XIM
1238 IMSetStatusPosition (); 1125 IMSetPosition ();
1239#endif 1126#endif
1240} 1127}
1241 1128
1242/* 1129/*
1243 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
1244 * good for toggling 80/132 columns 1131 * good for toggling 80/132 columns
1245 */ 1132 */
1246void 1133void
1247rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1134rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1248{ 1135{
1249 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1250 1137
1251 if (width == 0 || height == 0) 1138 if (newwidth == 0 || newheight == 0)
1252 { 1139 {
1253 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1141
1254 if (width == 0) 1142 if (newwidth == 0)
1255 width = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1256 if (height == 0) 1144 if (newheight == 0)
1257 height = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
1258 }
1259
1260 if (width != TermWin.width || height != TermWin.height)
1261 { 1146 }
1147
1148 if (newwidth != width || newheight != height)
1149 {
1262 width += szHint.base_width; 1150 newwidth += szHint.base_width;
1263 height += szHint.base_height; 1151 newheight += szHint.base_height;
1264 resize_all_windows (width, height, 0); 1152 resize_all_windows (newwidth, newheight, 0);
1265 } 1153 }
1266} 1154}
1267 1155
1268/* -------------------------------------------------------------------- * 1156/* -------------------------------------------------------------------- *
1269 * - X INPUT METHOD ROUTINES - * 1157 * - X INPUT METHOD ROUTINES - *
1271#ifdef USE_XIM 1159#ifdef USE_XIM
1272 1160
1273void 1161void
1274rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1275{ 1163{
1276 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1277 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1278} 1166}
1279 1167
1280void 1168void
1281rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1282{ 1170{
1283 // the int_bwidth terms make no sense to me 1171 // the int_bwidth terms make no sense to me
1284 size.x = TermWin.int_bwidth; 1172 size.x = int_bwidth;
1285 size.y = TermWin.int_bwidth; 1173 size.y = int_bwidth;
1286 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1174 size.width = Width2Pixel (ncol) + int_bwidth;
1287 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1175 size.height = Height2Pixel (nrow) + int_bwidth;
1288} 1176}
1289 1177
1290void 1178void
1291rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1179rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1292 XRectangle &status_rect, 1180 XRectangle &status_rect,
1293 const XRectangle &needed_rect) 1181 const XRectangle &needed_rect)
1294{ 1182{
1295 preedit_rect.x = needed_rect.width; 1183 preedit_rect.x = needed_rect.width;
1296 preedit_rect.y = 0; 1184 preedit_rect.y = 0;
1297 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1185 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1298 preedit_rect.height = TermWin.fheight; 1186 preedit_rect.height = fheight;
1299 1187
1300 status_rect.x = 0; 1188 status_rect.x = 0;
1301 status_rect.y = 0; 1189 status_rect.y = 0;
1302 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1190 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1303 status_rect.height = TermWin.fheight; 1191 status_rect.height = fheight;
1304} 1192}
1305 1193
1306/* Checking whether input method is running. */ 1194/* Checking whether input method is running. */
1307bool 1195bool
1308rxvt_term::IMisRunning () 1196rxvt_term::IMisRunning ()
1319 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1320 1208
1321 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1322 *p = '\0'; 1210 *p = '\0';
1323 1211
1324 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1325 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1326 1214
1327 if (win != None) 1215 if (win != None)
1328 return True; 1216 return True;
1329 } 1217 }
1330 1218
1336{ 1224{
1337 XPoint nspot; 1225 XPoint nspot;
1338 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1339 1227
1340 if (!Input_Context 1228 if (!Input_Context
1341 || !TermWin.focus 1229 || !focus
1342 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1343 return; 1231 return;
1344 1232
1345 im_set_position (nspot); 1233 im_set_position (nspot);
1346 1234
1347 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
1366 input_method = 0; 1254 input_method = 0;
1367 } 1255 }
1368 1256
1369 Input_Context = 0; 1257 Input_Context = 0;
1370} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1371 1333
1372/* 1334/*
1373 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1374 * open a suitable preedit type 1336 * open a suitable preedit type
1375 */ 1337 */
1382 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1383 unsigned long fg, bg; 1345 unsigned long fg, bg;
1384 const char *p; 1346 const char *p;
1385 char **s; 1347 char **s;
1386 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1352
1353 set_environ (envv);
1387 1354
1388 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1389 return false; 1356 return false;
1390 1357
1391 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1392 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1393 if (input_method == NULL) 1359 if (input_method == NULL)
1394 return false; 1360 return false;
1395 1361
1396 xim = input_method->xim; 1362 xim = input_method->xim;
1416 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1417 1383
1418 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1419 { 1385 {
1420 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1421 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1422 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1423 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1424 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1425 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1426 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1427 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1428 1400
1429 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1430 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1431 { 1403 {
1432 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1438 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1439 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1440 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1441 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "*", 1442 "*",
1471 TermWin.fheight, 1443 fheight,
1472 TermWin.fheight + 1, TermWin.fheight - 1, 1444 fheight + 1, fheight - 1,
1473 TermWin.fheight - 2, TermWin.fheight + 2); 1445 fheight - 2, fheight + 2);
1474 1446
1475 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1476 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1477 1449
1478 if (missing_charset_list) 1450 if (missing_charset_list)
1479 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1480 1452
1521 XNBackground, bg, 1493 XNBackground, bg,
1522 XNArea, &status_rect, 1494 XNArea, &status_rect,
1523 XNFontSet, fs, 1495 XNFontSet, fs,
1524 NULL); 1496 NULL);
1525 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1526 1521
1527 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1528 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1529 XNClientWindow, TermWin.vt, 1524 XNClientWindow, vt,
1530 XNFocusWindow, TermWin.parent[0], 1525 XNFocusWindow, parent[0],
1531 preedit_attr ? XNPreeditAttributes : NULL, 1526 preedit_attr ? XNPreeditAttributes : NULL,
1532 preedit_attr, 1527 preedit_attr,
1533 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1534 status_attr, NULL); 1529 status_attr, NULL);
1535 1530
1536 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1537 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1538 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1539 1534
1540 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1541 { 1536 {
1542 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1543 im_destroy (); 1538 im_destroy ();
1544 return false; 1539 return false;
1545 } 1540 }
1546 1541
1547 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1548 IMSetStatusPosition (); 1548 IMSetPosition ();
1549 1549
1550 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1551 return true; 1550 return true;
1552} 1551}
1553 1552
1554void 1553void
1555rxvt_term::im_cb () 1554rxvt_term::im_cb ()
1556{ 1555{
1557 int i, found, had_im; 1556 int i;
1558 const char *p; 1557 const char *p;
1559 char **s; 1558 char **s;
1560 char buf[IMBUFSIZ]; 1559 char buf[IMBUFSIZ];
1561 1560
1562 SET_R (this); 1561 make_current ();
1563 1562
1564 im_destroy (); 1563 im_destroy ();
1565 1564
1566 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1567 if (Input_Context) 1565 if (Input_Context)
1568 return; 1566 return;
1569 1567
1570#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1571 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
1613 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1614#endif 1612#endif
1615} 1613}
1616 1614
1617void 1615void
1618rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1619{ 1617{
1620 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1621 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1622 1620
1623 if (!Input_Context 1621 if (!Input_Context
1624 || !TermWin.focus 1622 || !focus
1625 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1626 || !IMisRunning ()) 1624 || !IMisRunning ())
1627 return; 1625 return;
1628 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1629 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1630 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1631 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1632 XFree (status_attr); 1640 XFree (status_attr);
1633 1641
1634 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1635 XFree (needed_rect); 1643 XFree (needed_rect);
1636 1644
1637 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1638 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1639 1647
1640 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1641 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1642 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1643 1652
1653 XFree (status_attr);
1654 }
1655
1644 XFree (preedit_attr); 1656 XFree (preedit_attr);
1645 XFree (status_attr);
1646} 1657}
1647#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1648 1659
1649/*----------------------------------------------------------------------*/
1650rxvt_t rxvt_current_term;
1651
1652/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines