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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.289 by ayin, Tue Dec 18 11:15:24 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
214 pty_ev.stop ();
203 delete pty; pty = 0; 215 delete pty; pty = 0;
204} 216}
205 217
206rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
207{ 219{
… …
216#endif 228#endif
217 delete fontset[0]; 229 delete fontset[0];
218 230
219 if (display) 231 if (display)
220 { 232 {
221 dDisp;
222
223 selection_clear (); 233 selection_clear ();
224 234
225#ifdef USE_XIM 235#ifdef USE_XIM
226 im_destroy (); 236 im_destroy ();
227#endif 237#endif
228#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 241#endif
232#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 244#endif
235#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 256#endif
247#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 261#endif
252 if (gc) XFreeGC (disp, gc); 262 if (gc) XFreeGC (dpy, gc);
253 263
254 delete drawable; 264 delete drawable;
255 // destroy all windows 265 // destroy all windows
256 if (parent[0]) 266 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
258 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display 269 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 273#if OFF_FOCUS_FADING
274 pix_colors_unfocused [i].free (this);
275#endif
276 }
277
278 clear ();
279 }
280
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 283 delete [] pix_colors_unfocused;
264#endif 284#endif
265 285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */
266 displays.put (display); 290 displays.put (display);
267 291
268 scr_release (); 292 scr_release ();
269 293
270 /* clear all resources */ 294 /* clear all resources */
… …
283 delete argv; 307 delete argv;
284 308
285#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
286 delete keyboard; 310 delete keyboard;
287#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
288} 315}
289 316
290// child has exited, usually destroys 317// child has exited, usually destroys
291void 318void
292rxvt_term::child_cb (child_watcher &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
293{ 320{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 321 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 322
296 cmd_pid = 0; 323 cmd_pid = 0;
297 324
298 if (!OPTION (Opt_hold)) 325 if (!option (Opt_hold))
299 destroy (); 326 destroy ();
300} 327}
301 328
302void 329void
303rxvt_term::destroy () 330rxvt_term::destroy ()
304{ 331{
305 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
306 return; 333 return;
307 334
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 336
310#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
317 im_ev.stop (display); 344 im_ev.stop (display);
318#endif 345#endif
319#if HAVE_SCROLLBARS 346#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 347 scrollbar_ev.stop (display);
321#endif 348#endif
322#if TRANSPARENT 349#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 350 rootwin_ev.stop (display);
324#endif 351#endif
325 incr_ev.stop (); 352 incr_ev.stop ();
326 termwin_ev.stop (display); 353 termwin_ev.stop (display);
327 vt_ev.stop (display); 354 vt_ev.stop (display);
328 } 355 }
329 356
330 check_ev.stop (); 357 flush_ev.stop ();
331 pty_ev.stop (); 358 pty_ev.stop ();
332#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
334#endif 361#endif
335#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
343#endif 370#endif
344#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
345 pointer_ev.stop (); 372 pointer_ev.stop ();
346#endif 373#endif
347 374
348 destroy_ev.start (0); 375 destroy_ev.start ();
349} 376}
350 377
351void 378void
352rxvt_term::destroy_cb (time_watcher &w) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 380{
354 make_current (); 381 make_current ();
355 382
356 delete this; 383 delete this;
357} 384}
… …
368{ 395{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 396 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 397 (*t)->emergency_cleanup ();
371} 398}
372 399
373#if ENABLE_FRILLS 400#if !ENABLE_MINIMAL
374static void 401static void
375print_x_error (Display *dpy, XErrorEvent *event) 402print_x_error (Display *dpy, XErrorEvent *event)
376{ 403{
377 char buffer[BUFSIZ]; 404 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 405 char mesg[BUFSIZ];
… …
411 else 438 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 440 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 442 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 444 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 446}
420#endif 447#endif
421 448
… …
426 GET_R->allowedxerror = event->error_code; 453 GET_R->allowedxerror = event->error_code;
427 else 454 else
428 { 455 {
429 // GET_R is most likely not the terminal which caused the error, 456 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 457 // so just output the error and continue
431#if ENABLE_FRILLS 458#if ENABLE_MINIMAL
459 old_xerror_handler (display, event);
460#else
432 print_x_error (display, event); 461 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 462#endif
436 } 463 }
437 464
438 return 0; 465 return 0;
439} 466}
… …
446 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
448} 475}
449 476
450/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
451bool 478void
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 480{
454 this->envv = envv; 481 this->envv = envv;
455 482
456 SET_R (this); 483 SET_R (this);
457 set_locale (""); 484 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
459 486
460 if (!init_vars ()) 487 init_vars ();
461 return false;
462 488
463 init_secondary (); 489 init_secondary ();
464 490
465 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
466 492
467#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 494 keyboard->register_done ();
469#endif 495#endif
470 496
471#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 500#endif
475 501
476 pty = ptytty::create (); 502 pty = ptytty::create ();
477 503
478 create_windows (argc, argv); 504 create_windows (argc, argv);
479 505
480 dDisp;
481
482 init_xlocale (); 506 init_xlocale ();
483 507
484 scr_reset (); // initialize screen 508 scr_reset (); // initialize screen
485 509
486#if 0 510#if 0
487 XSynchronize (disp, True); 511 XSynchronize (dpy, True);
488#endif 512#endif
489 513
490#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
493#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
494#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
495 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
496 { 524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
497 XSelectInput (disp, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
500 } 538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
501#endif 564#endif
502 565
503 set_colorfgbg (); 566 set_colorfgbg ();
504 567
505 init_command (cmd_argv); 568 init_command (cmd_argv);
506 569
507 free (cmd_argv); 570 free (cmd_argv);
508 571
509 if (pty->pty >= 0) 572 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
511
512 check_ev.start ();
513 574
514 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
515 576
516#if ENABLE_XEMBED 577#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
518 { 579 {
519 long info[2] = { 0, XEMBED_MAPPED }; 580 long info[2] = { 0, XEMBED_MAPPED };
520 581
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 583 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 584 }
524#endif 585#endif
525 586
526 XMapWindow (disp, vt); 587 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 588 XMapWindow (dpy, parent[0]);
528
529 return true;
530} 589}
531 590
532static struct sig_handlers 591static struct sig_handlers
533{ 592{
534 sig_watcher sw_term, sw_int; 593 ev::sig sw_term, sw_int;
535 594
536 /* 595 /*
537 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
538 */ 597 */
539 void 598 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 599
600 sig_handlers ()
541 { 601 {
542 rxvt_emergency_cleanup (); 602 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 604 }
552} sig_handlers; 605} sig_handlers;
553 606
607void
608sig_handlers::sig_term (ev::sig &w, int revents)
609{
610 rxvt_emergency_cleanup ();
611 w.stop ();
612 kill (getpid (), w.signum);
613}
614
554char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
555 616
556void 617void
557rxvt_init () 618rxvt_init ()
558{ 619{
559 ptytty::init (); 620 ptytty::init ();
621
622 if (!ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560 624
561 rxvt_environ = environ; 625 rxvt_environ = environ;
562 626
563 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
565 629
566 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568 632
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
571 635
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
574 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
575 639
576 XrmInitialize (); 640 XrmInitialize ();
577} 641}
578 642
579/* ------------------------------------------------------------------------- *
580 * MEMORY ALLOCATION WRAPPERS *
581 * ------------------------------------------------------------------------- */
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613}
614
615/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
616/* 644/*
617 * window size/position calculcations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
619 */ 647 */
620void 648void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 650{
623 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 652 int x, y, sb_w, flags;
625 unsigned int w, h; 653 unsigned int w, h;
626 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
627 dDisp;
628 655
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 658 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 659
… …
694 721
695 if (scrollBar.state) 722 if (scrollBar.state)
696 { 723 {
697 sb_w = scrollbar_TotalWidth (); 724 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 725 szHint.base_width += sb_w;
726
699 if (!OPTION (Opt_scrollBar_right)) 727 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 728 window_vt_x += sb_w;
701 } 729 }
702 730
703 szHint.width_inc = fwidth; 731 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 734 szHint.min_height = szHint.base_height + szHint.height_inc;
707 735
708 if (newwidth && newwidth - szHint.base_width < max_width) 736 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 737 {
710 szHint.width = newwidth; 738 szHint.width = newwidth;
… …
725 { 753 {
726 min_it (height, max_height); 754 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
728 } 756 }
729 757
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 758 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
732 760
733 if (recalc_x) 761 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763
735 if (recalc_y) 764 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 766
738 ncol = width / fwidth; 767 ncol = width / fwidth;
739 nrow = height / fheight; 768 nrow = height / fheight;
740} 769}
741 770
… …
757 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
758 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
760 789
761#if 0 790#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
765#endif 794#endif
766} 795}
767 796
… …
796 delete fontset[0]; 825 delete fontset[0];
797 fontset[0] = fs; 826 fontset[0] = fs;
798 827
799 prop = (*fs)[1]->properties (); 828 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 829 prop.height += lineSpace;
830
801 fs->set_prop (prop); 831 fs->set_prop (prop, false);
802 832
803 fwidth = prop.width; 833 fwidth = prop.width;
804 fheight = prop.height; 834 fheight = prop.height;
805 fbase = prop.ascent; 835 fbase = prop.ascent;
806 836
… …
815 { 845 {
816 fontset[style] = fs = new rxvt_fontset (this); 846 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 847 rxvt_fontprop prop2 = prop;
818 848
819 if (res) 849 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 850 {
851 fs->populate (res);
852 fs->set_prop (prop2, false);
853 }
821 else 854 else
822 { 855 {
823 res = fontset[0]->fontdesc; 856 fs->populate (fontset[0]->fontdesc);
824 857
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 858 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 859 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
860
861 fs->set_prop (prop2, true);
827 } 862 }
828 863
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 864 }
832#else 865#else
833 fontset[style] = fontset[0]; 866 fontset[style] = fontset[0];
834#endif 867#endif
835 } 868 }
… …
837 if (parent[0]) 870 if (parent[0])
838 { 871 {
839 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 873 scr_remap_chars ();
841 scr_touch (true); 874 scr_touch (true);
842 } 875 }
843 876
844 return true; 877 return true;
845} 878}
846 879
880void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 882{
849 XChangeProperty (display->display, parent[0], 883 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 886}
853 887
888void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 889rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 890{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 891 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 892 char *s = rxvt_wcstoutf8 (ws);
858 893
859 XChangeProperty (display->display, parent[0], 894 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 895 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 896 (const unsigned char *)s, strlen (s));
862 897
863 free (s); 898 free (s);
864 free (ws); 899 free (ws);
… …
883#if ENABLE_EWMH 918#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 920#endif
886} 921}
887 922
923void
924rxvt_term::set_window_color (int idx, const char *color)
925{
888#ifdef XTERM_COLOR_CHANGE 926#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 927 rxvt_color xcol;
893 int i; 928 int i;
894 929
895 if (color == NULL || *color == '\0') 930 if (color == NULL || *color == '\0')
896 return; 931 return;
897 932
933 color = strdup (color);
934 allocated.push_back ((void *)color);
935 rs[Rs_color + idx] = color;
936
898 /* handle color aliases */ 937 /* handle color aliases */
899 if (isdigit (*color)) 938 if (isdigit (*color))
900 { 939 {
901 i = atoi (color); 940 i = atoi (color);
902 941
903 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
943 {
904 { /* bright colors */ 944 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 946 goto done;
909 } 947 }
910 948
911 if (i >= 0 && i <= 7) 949 if (i >= 0 && i <= 7)
950 {
912 { /* normal colors */ 951 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 953 goto done;
916 } 954 }
917 } 955 }
918 956
919 if (!rXParseAllocColor (&xcol, color)) 957 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 958
924 /* 959 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
927 */ 962 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 963
940 pix_colors_focused[idx] = xcol; 964 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 965
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 966done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 967 /*TODO: handle Color_BD, scrollbar background, etc. */
953 968
969 update_fade_color (idx);
954 recolour_cursor (); 970 recolour_cursor ();
955 scr_recolour (); 971 scr_recolour ();
972#endif /* XTERM_COLOR_CHANGE */
956} 973}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 974
962void 975void
963rxvt_term::recolour_cursor () 976rxvt_term::recolour_cursor ()
964{ 977{
965 XColor xcol[2]; 978 XColor fg, bg;
966 979
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 980 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 981 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 982 : pix_colors_focused[Color_fg]).get (fg);
983
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 984 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 985 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 986 : pix_colors_focused[Color_bg]).get (bg);
973 987
974 XQueryColors (display->display, display->cmap, xcol, 2); 988 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 989}
977 990
978/*----------------------------------------------------------------------*/ 991/*----------------------------------------------------------------------*/
979/* 992/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 993 * find if fg/bg matches any of the normal (low-intensity) colors
981 */ 994 */
982void 995void
983rxvt_term::set_colorfgbg () 996rxvt_term::set_colorfgbg ()
984{ 997{
985 unsigned int i; 998 unsigned int i;
986 const char *xpmb = "\0"; 999 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1000 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988 1001
989 strcpy (fstr, "default"); 1002 strcpy (fstr, "default");
990 strcpy (bstr, "default"); 1003 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 1004 for (i = Color_Black; i <= Color_White; i++)
… …
997 1010
998 for (i = Color_Black; i <= Color_White; i++) 1011 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 1012 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 1013 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 1014 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 1015#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 1016 xpmb = "default;";
1004#endif 1017#endif
1005 break; 1018 break;
1006 } 1019 }
1007 1020
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1021 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1022}
1010 1023
1011/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
1012 1025
1013int 1026bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1027rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1028{
1016 if (!screen_in_out->set (display, colour)) 1029 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 1030 return true;
1031
1032 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1033 return false;
1034}
1035
1036void
1037rxvt_term::alias_color (int dst, int src)
1038{
1039 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1040}
1024 1041
1025/* -------------------------------------------------------------------- * 1042/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1043 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1044 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1046rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1047{
1031 int fix_screen; 1048 int fix_screen;
1032 int old_width = szHint.width; 1049 int old_width = szHint.width;
1033 int old_height = szHint.height; 1050 int old_height = szHint.height;
1034 dDisp;
1035 1051
1036 window_calc (newwidth, newheight); 1052 window_calc (newwidth, newheight);
1053
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1055 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1056
1039 if (!ignoreparent) 1057 if (!ignoreparent)
1040 { 1058 {
1041#ifdef SMART_RESIZE 1059#ifdef SMART_RESIZE
1042 /* 1060 /*
… …
1046 int x, y, x1, y1; 1064 int x, y, x1, y1;
1047 int dx, dy; 1065 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1067 Window unused_cr;
1050 1068
1051 XTranslateCoordinates (disp, parent[0], display->root, 1069 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1070 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1071 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1073 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1074 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1075 * our position for handles and decorations. Counter it
1058 */ 1076 */
… …
1060 { 1078 {
1061 x -= x1; 1079 x -= x1;
1062 y -= y1; 1080 y -= y1;
1063 } 1081 }
1064 1082
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1083 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1084 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1085 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1086 dy = old_height - szHint.height;
1069 1087
1070 /* Check position of the center of the window */ 1088 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1089 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1093 if (y < y1) /* top half */
1076 dy = 0; 1094 dy = 0;
1077 else if (y == y1) /* exact center */ 1095 else if (y == y1) /* exact center */
1078 dy /= 2; 1096 dy /= 2;
1079 1097
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1098 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1099 szHint.width, szHint.height);
1082#else 1100#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1102#endif
1085 } 1103 }
1086 1104
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1106
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1107 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1108 {
1091 if (scrollBar.state) 1109 if (scrollBar.state)
1092 { 1110 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1111 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1112 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1113 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1114 resize_scrollbar ();
1097 } 1115 }
1098 1116
1099 XMoveResizeWindow (disp, vt, 1117 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1118 window_vt_x, window_vt_y,
1101 width, height); 1119 width, height);
1102 1120
1121#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ())
1123 update_background ();
1124#endif
1125
1103 scr_clear (); 1126 scr_clear ();
1104#ifdef XPM_BACKGROUND
1105 resize_pixmap ();
1106#endif
1107 } 1127 }
1108 1128
1109 if (fix_screen || old_height == 0) 1129 if (fix_screen || old_height == 0)
1110 scr_reset (); 1130 scr_reset ();
1111 1131
1112#ifdef XPM_BACKGROUND 1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113 if (pixmap) 1133 //scr_touch (false);
1134
1135#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137// if (bgPixmap.pixmap)
1114 scr_touch (false); 1138// scr_touch (false);
1115#endif 1139#endif
1116 1140
1117#ifdef USE_XIM 1141#ifdef USE_XIM
1118 IMSetStatusPosition (); 1142 IMSetPosition ();
1119#endif 1143#endif
1120} 1144}
1121 1145
1122/* 1146/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1152{
1129 XWindowAttributes wattr; 1153 XWindowAttributes wattr;
1130 1154
1131 if (newwidth == 0 || newheight == 0) 1155 if (newwidth == 0 || newheight == 0)
1132 { 1156 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1157 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1158
1135 if (newwidth == 0) 1159 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1161 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1176#ifdef USE_XIM
1153 1177
1154void 1178void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1180{
1157 fg = pix_colors[Color_fg]; 1181 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1182 bg = pix_colors [Color_bg];
1159} 1183}
1160 1184
1161void 1185void
1162rxvt_term::im_set_size (XRectangle &size) 1186rxvt_term::im_set_size (XRectangle &size)
1163{ 1187{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1225
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1227 *p = '\0';
1204 1228
1205 atom = XInternAtom (display->display, server, False); 1229 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1230 win = XGetSelectionOwner (dpy, atom);
1207 1231
1208 if (win != None) 1232 if (win != None)
1209 return True; 1233 return True;
1210 } 1234 }
1211 1235
… …
1290 if (term->rs[Rs_imLocale]) 1314 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1315 SET_LOCALE (term->locale);
1292 } 1316 }
1293 else 1317 else
1294 str = (void *)text->string.wide_char; 1318 str = (void *)text->string.wide_char;
1295 1319
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1321 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1322 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1323 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1324 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1435 "*", 1459 "*",
1436 fheight, 1460 fheight,
1437 fheight + 1, fheight - 1, 1461 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1462 fheight - 2, fheight + 2);
1439 1463
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1464 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1465 &missing_charset_list, &missing_charset_count, &def_string);
1442 1466
1443 if (missing_charset_list) 1467 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1468 XFreeStringList (missing_charset_list);
1445 1469
… …
1486 XNBackground, bg, 1510 XNBackground, bg,
1487 XNArea, &status_rect, 1511 XNArea, &status_rect,
1488 XNFontSet, fs, 1512 XNFontSet, fs,
1489 NULL); 1513 NULL);
1490 } 1514 }
1515#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1516 else if (input_style & XIMPreeditCallbacks)
1492 { 1517 {
1493 im_set_position (spot); 1518 im_set_position (spot);
1494 1519
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1520 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1521 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1523# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1524 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1525# endif
1501 1526
1502 preedit_attr = XVaCreateNestedList (0, 1527 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1528 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1529 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1530 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1531 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1532# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1533 XNPreeditCaretCallback, &xcb[3],
1509#endif 1534# endif
1510 NULL); 1535 NULL);
1511 } 1536 }
1537#endif
1512 1538
1513 Input_Context = XCreateIC (xim, 1539 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1540 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1541 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1542 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1544 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1546 status_attr, NULL);
1521 1547
1522 if (preedit_attr) XFree (preedit_attr); 1548 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1549 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1550 if (fs) XFreeFontSet (dpy, fs);
1525 1551
1526 if (Input_Context == NULL) 1552 if (Input_Context == NULL)
1527 { 1553 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1554 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1555 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1562 vt_select_input ();
1537#endif 1563#endif
1538 1564
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1565 IMSetPosition ();
1541 1566
1542 return true; 1567 return true;
1543} 1568}
1544 1569
1545void 1570void
… …
1603 SET_LOCALE (locale); 1628 SET_LOCALE (locale);
1604#endif 1629#endif
1605} 1630}
1606 1631
1607void 1632void
1608rxvt_term::IMSetStatusPosition () 1633rxvt_term::IMSetPosition ()
1609{ 1634{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1635 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1636 XVaNestedList preedit_attr, status_attr;
1612 1637
1613 if (!Input_Context 1638 if (!Input_Context
1614 || !focus 1639 || !focus
1615 || !(input_style & XIMPreeditArea) 1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1641 || !IMisRunning ())
1617 return; 1642 return;
1618 1643
1644 if (input_style & XIMPreeditPosition)
1645 {
1646 im_set_size (preedit_rect);
1647 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1648
1649 XSetICValues (Input_Context,
1650 XNPreeditAttributes, preedit_attr, NULL);
1651 }
1652 else
1653 {
1619 /* Getting the necessary width of preedit area */ 1654 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1655 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1656 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1657 XFree (status_attr);
1623 1658
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1659 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1660 XFree (needed_rect);
1626 1661
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1662 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1663 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1664
1630 XSetICValues (Input_Context, 1665 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1666 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1667 XNStatusAttributes, status_attr,
1668 NULL);
1633 1669
1670 XFree (status_attr);
1671 }
1672
1634 XFree (preedit_attr); 1673 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1674}
1637#endif /* USE_XIM */ 1675#endif /* USE_XIM */
1676
1677void
1678rxvt_term::get_window_origin (int &x, int &y)
1679{
1680 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683}
1684
1685Pixmap
1686rxvt_term::get_pixmap_property (int prop_id)
1687{
1688 if (prop_id > 0 && prop_id < NUM_XA)
1689 if (xa[prop_id])
1690 {
1691 int aformat;
1692 unsigned long nitems, bytes_after;
1693 Atom atype;
1694 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP)
1699 {
1700 return *(Pixmap *)prop;
1701 }
1702 }
1703 return None;
1704}
1705
1706#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709int rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715
1716int
1717rxvt_term::update_background ()
1718{
1719 bgPixmap.invalidate ();
1720
1721 /* no chance of real time refresh if we are blurring! */
1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1723 bgPixmap.render ();
1724 else
1725 {
1726 ev_tstamp refresh;
1727 update_background_ev.stop ();
1728
1729 if (!bgPixmap.need_client_side_rendering ())
1730 refresh = .05;
1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732 refresh = .20; /* very slow !!! */
1733 else
1734 refresh = .07;
1735 update_background_ev.start (refresh);
1736 }
1737
1738 return 0;
1739}
1740
1741void
1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1743{
1744 make_current ();
1745 bgPixmap.render ();
1746 refresh_check ();
1747}
1748
1749#endif /* HAVE_BG_PIXMAP */
1638 1750
1639/*----------------------- end-of-file (C source) -----------------------*/ 1751/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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