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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines