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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines