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

Diff Legend

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