ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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