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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.285 by root, Fri Dec 14 06:32:38 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
266 displays.put (display); 289 displays.put (display);
267 290
268 scr_release (); 291 scr_release ();
269 292
270 /* clear all resources */ 293 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 294 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 295 free (allocated [i]);
273 296
274 free (selection.text); 297 free (selection.text);
275 // TODO: manage env vars in child only(!) 298 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 299 free (env_display);
278 free (env_term); 300 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 301 free (locale);
281 free (v_buffer); 302 free (v_buffer);
282 free (incr_buf); 303 free (incr_buf);
283 304
284 delete envv; 305 delete envv;
285 delete argv; 306 delete argv;
286 307
287#ifdef KEYSYM_RESOURCE 308#ifdef KEYSYM_RESOURCE
288 delete keyboard; 309 delete keyboard;
289#endif 310#endif
311#ifndef NO_RESOURCES
312 XrmDestroyDatabase (option_db);
313#endif
290} 314}
291 315
292// child has exited, usually destroys 316// child has exited, usually destroys
293void 317void
294rxvt_term::child_cb (child_watcher &w, int status) 318rxvt_term::child_cb (ev::child &w, int status)
295{ 319{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 320 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 321
298 cmd_pid = 0; 322 cmd_pid = 0;
299 323
300 if (!OPTION (Opt_hold)) 324 if (!option (Opt_hold))
301 destroy (); 325 destroy ();
302} 326}
303 327
304void 328void
305rxvt_term::destroy () 329rxvt_term::destroy ()
306{ 330{
307 if (destroy_ev.active) 331 if (destroy_ev.is_active ())
308 return; 332 return;
309 333
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 335
312#if ENABLE_OVERLAY 336#if ENABLE_OVERLAY
… …
319 im_ev.stop (display); 343 im_ev.stop (display);
320#endif 344#endif
321#if HAVE_SCROLLBARS 345#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 346 scrollbar_ev.stop (display);
323#endif 347#endif
324#if TRANSPARENT 348#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 349 rootwin_ev.stop (display);
326#endif 350#endif
327 incr_ev.stop (); 351 incr_ev.stop ();
328 termwin_ev.stop (display); 352 termwin_ev.stop (display);
329 vt_ev.stop (display); 353 vt_ev.stop (display);
330 } 354 }
331 355
332 check_ev.stop (); 356 flush_ev.stop ();
333 pty_ev.stop (); 357 pty_ev.stop ();
334#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
336#endif 360#endif
337#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
345#endif 369#endif
346#ifdef POINTER_BLANK 370#ifdef POINTER_BLANK
347 pointer_ev.stop (); 371 pointer_ev.stop ();
348#endif 372#endif
349 373
350 destroy_ev.start (0); 374 destroy_ev.start ();
351} 375}
352 376
353void 377void
354rxvt_term::destroy_cb (time_watcher &w) 378rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 379{
356 make_current (); 380 make_current ();
357 381
358 delete this; 382 delete this;
359} 383}
… …
370{ 394{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 395 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 396 (*t)->emergency_cleanup ();
373} 397}
374 398
375#if ENABLE_FRILLS 399#if !ENABLE_MINIMAL
376static void 400static void
377print_x_error (Display *dpy, XErrorEvent *event) 401print_x_error (Display *dpy, XErrorEvent *event)
378{ 402{
379 char buffer[BUFSIZ]; 403 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 404 char mesg[BUFSIZ];
… …
413 else 437 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 439 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 441 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 443 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 445}
422#endif 446#endif
423 447
… …
428 GET_R->allowedxerror = event->error_code; 452 GET_R->allowedxerror = event->error_code;
429 else 453 else
430 { 454 {
431 // GET_R is most likely not the terminal which caused the error, 455 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 456 // so just output the error and continue
433#if ENABLE_FRILLS 457#if ENABLE_MINIMAL
458 old_xerror_handler (display, event);
459#else
434 print_x_error (display, event); 460 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 461#endif
438 } 462 }
439 463
440 return 0; 464 return 0;
441} 465}
… …
448 rxvt_emergency_cleanup (); 472 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 473 _exit (EXIT_FAILURE);
450} 474}
451 475
452/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
453bool 477void
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{ 479{
456 this->envv = envv; 480 this->envv = envv;
457 481
458 SET_R (this); 482 SET_R (this);
459 set_locale (""); 483 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :( 484 set_environ (envv); // few things in X do not call setlocale :(
461 485
462 if (!init_vars ()) 486 init_vars ();
463 return false;
464 487
465 init_secondary (); 488 init_secondary ();
466 489
467 const char **cmd_argv = init_resources (argc, argv); 490 const char **cmd_argv = init_resources (argc, argv);
468 491
469#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
470 keyboard->register_done (); 493 keyboard->register_done ();
471#endif 494#endif
472 495
473#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 497 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 498 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 499#endif
477 500
478 pty = ptytty::create (); 501 pty = ptytty::create ();
479 502
480 create_windows (argc, argv); 503 create_windows (argc, argv);
481 504
482 dDisp;
483
484 init_xlocale (); 505 init_xlocale ();
485 506
486 scr_reset (); // initialize screen 507 scr_reset (); // initialize screen
487 508
488#if 0 509#if 0
489 XSynchronize (disp, True); 510 XSynchronize (dpy, True);
490#endif 511#endif
491 512
492#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 514 if (option (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 515 resize_scrollbar (); /* create and map scrollbar */
495#endif 516#endif
517#ifdef HAVE_BG_PIXMAP
518 {
519 bgPixmap.set_target (this);
520
496#ifdef TRANSPARENT 521#ifdef ENABLE_TRANSPARENCY
497 if (OPTION (Opt_transparent)) 522 if (option (Opt_transparent))
498 { 523 {
524 bgPixmap.set_transparent ();
525#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif
529 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
499 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root); 536 rootwin_ev.start (display, display->root);
502 } 537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL)
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != NULL)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
503#endif 563#endif
504 564
505 set_colorfgbg (); 565 set_colorfgbg ();
506 566
507 init_command (cmd_argv); 567 init_command (cmd_argv);
508 568
509 free (cmd_argv); 569 free (cmd_argv);
510 570
511 if (pty->pty >= 0) 571 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ); 572 pty_ev.start (pty->pty, ev::READ);
513
514 check_ev.start ();
515 573
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 575
518#if ENABLE_XEMBED 576#if ENABLE_XEMBED
519 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
520 { 578 {
521 long info[2] = { 0, XEMBED_MAPPED }; 579 long info[2] = { 0, XEMBED_MAPPED };
522 580
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2); 582 32, PropModeReplace, (unsigned char *)&info, 2);
525 } 583 }
526#endif 584#endif
527 585
528 XMapWindow (disp, vt); 586 XMapWindow (dpy, vt);
529 XMapWindow (disp, parent[0]); 587 XMapWindow (dpy, parent[0]);
530
531 return true;
532} 588}
533 589
534static struct sig_handlers 590static struct sig_handlers
535{ 591{
536 sig_watcher sw_term, sw_int; 592 ev::sig sw_term, sw_int;
537 593
538 /* 594 /*
539 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
540 */ 596 */
541 void 597 void sig_term (ev::sig &w, int revents);
542 sig_term (sig_watcher &w) 598
599 sig_handlers ()
543 { 600 {
544 rxvt_emergency_cleanup (); 601 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term) 602 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
552 {
553 } 603 }
554} sig_handlers; 604} sig_handlers;
555 605
606void
607sig_handlers::sig_term (ev::sig &w, int revents)
608{
609 rxvt_emergency_cleanup ();
610 w.stop ();
611 kill (getpid (), w.signum);
612}
613
556char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
557 615
558void 616void
559rxvt_init () 617rxvt_init ()
560{ 618{
561 ptytty::init (); 619 ptytty::init ();
620
621 if (!ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
562 623
563 rxvt_environ = environ; 624 rxvt_environ = environ;
564 625
565 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
567 628
568 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
569 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
570 631
571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
572 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
573 634
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
614 return p; 675 return p;
615} 676}
616 677
617/*----------------------------------------------------------------------*/ 678/*----------------------------------------------------------------------*/
618/* 679/*
619 * window size/position calculcations for XSizeHint and other storage. 680 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 681 * if width/height are non-zero then override calculated width/height
621 */ 682 */
622void 683void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 685{
625 short recalc_x, recalc_y; 686 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 687 int x, y, sb_w, flags;
627 unsigned int w, h; 688 unsigned int w, h;
628 unsigned int max_width, max_height; 689 unsigned int max_width, max_height;
629 dDisp;
630 690
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 692 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 693 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 694
… …
696 756
697 if (scrollBar.state) 757 if (scrollBar.state)
698 { 758 {
699 sb_w = scrollbar_TotalWidth (); 759 sb_w = scrollbar_TotalWidth ();
700 szHint.base_width += sb_w; 760 szHint.base_width += sb_w;
761
701 if (!OPTION (Opt_scrollBar_right)) 762 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 763 window_vt_x += sb_w;
703 } 764 }
704 765
705 szHint.width_inc = fwidth; 766 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 767 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 768 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 769 szHint.min_height = szHint.base_height + szHint.height_inc;
709 770
710 if (newwidth && newwidth - szHint.base_width < max_width) 771 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 772 {
712 szHint.width = newwidth; 773 szHint.width = newwidth;
… …
727 { 788 {
728 min_it (height, max_height); 789 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 790 szHint.height = szHint.base_height + height;
730 } 791 }
731 792
732 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 793 if (scrollBar.state && option (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 794 window_sb_x = szHint.width - sb_w;
734 795
735 if (recalc_x) 796 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798
737 if (recalc_y) 799 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 800 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 801
740 ncol = width / fwidth; 802 ncol = width / fwidth;
741 nrow = height / fheight; 803 nrow = height / fheight;
742} 804}
743 805
… …
759 ws.ws_xpixel = width; 821 ws.ws_xpixel = width;
760 ws.ws_ypixel = height; 822 ws.ws_ypixel = height;
761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
762 824
763#if 0 825#if 0
764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 826 // TIOCSWINSZ is supposed to do this automatically and correctly
765 if (cmd_pid) /* force through to the command */ 827 if (cmd_pid) /* force through to the command */
766 kill (-cmd_pid, SIGWINCH); 828 kill (-cmd_pid, SIGWINCH);
767#endif 829#endif
768} 830}
769 831
… …
798 delete fontset[0]; 860 delete fontset[0];
799 fontset[0] = fs; 861 fontset[0] = fs;
800 862
801 prop = (*fs)[1]->properties (); 863 prop = (*fs)[1]->properties ();
802 prop.height += lineSpace; 864 prop.height += lineSpace;
865
803 fs->set_prop (prop); 866 fs->set_prop (prop, false);
804 867
805 fwidth = prop.width; 868 fwidth = prop.width;
806 fheight = prop.height; 869 fheight = prop.height;
807 fbase = prop.ascent; 870 fbase = prop.ascent;
808 871
… …
817 { 880 {
818 fontset[style] = fs = new rxvt_fontset (this); 881 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 882 rxvt_fontprop prop2 = prop;
820 883
821 if (res) 884 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 885 {
886 fs->populate (res);
887 fs->set_prop (prop2, false);
888 }
823 else 889 else
824 { 890 {
825 res = fontset[0]->fontdesc; 891 fs->populate (fontset[0]->fontdesc);
826 892
827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 893 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 894 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
895
896 fs->set_prop (prop2, true);
829 } 897 }
830 898
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 899 }
834#else 900#else
835 fontset[style] = fontset[0]; 901 fontset[style] = fontset[0];
836#endif 902#endif
837 } 903 }
… …
839 if (parent[0]) 905 if (parent[0])
840 { 906 {
841 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
842 scr_remap_chars (); 908 scr_remap_chars ();
843 scr_touch (true); 909 scr_touch (true);
844 } 910 }
845 911
846 return true; 912 return true;
847} 913}
848 914
915void
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 916rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 917{
851 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 919 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 920 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 921}
855 922
923void
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 924rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 925{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 926 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 927 char *s = rxvt_wcstoutf8 (ws);
860 928
861 XChangeProperty (display->display, parent[0], 929 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 930 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 931 (const unsigned char *)s, strlen (s));
864 932
865 free (s); 933 free (s);
866 free (ws); 934 free (ws);
… …
885#if ENABLE_EWMH 953#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
887#endif 955#endif
888} 956}
889 957
958void
959rxvt_term::set_window_color (int idx, const char *color)
960{
890#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
891void
892rxvt_term::set_window_color (int idx, const char *color)
893{
894 rxvt_color xcol; 962 rxvt_color xcol;
895 int i; 963 int i;
896 964
897 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
898 return; 966 return;
899 967
968 color = strdup (color);
969 allocated.push_back ((void *)color);
970 rs[Rs_color + idx] = color;
971
900 /* handle color aliases */ 972 /* handle color aliases */
901 if (isdigit (*color)) 973 if (isdigit (*color))
902 { 974 {
903 i = atoi (color); 975 i = atoi (color);
904 976
905 if (i >= 8 && i <= 15) 977 if (i >= 8 && i <= 15)
978 {
906 { /* bright colors */ 979 /* bright colors */
907 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909 SET_PIXCOLOR (idx);
910 goto done; 981 goto done;
911 } 982 }
912 983
913 if (i >= 0 && i <= 7) 984 if (i >= 0 && i <= 7)
985 {
914 { /* normal colors */ 986 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 988 goto done;
918 } 989 }
919 } 990 }
920 991
921 if (!rXParseAllocColor (&xcol, color)) 992 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 993
926 /* 994 /*
927 * 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,
928 * so just keep gobbling up the colormap 996 * so just keep gobbling up the colormap
929 */ 997 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 998
942 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 1000
945 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */
947done: 1001done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 1002 /*TODO: handle Color_BD, scrollbar background, etc. */
955 1003
1004 update_fade_color (idx);
956 recolour_cursor (); 1005 recolour_cursor ();
957 scr_recolour (); 1006 scr_recolour ();
1007#endif /* XTERM_COLOR_CHANGE */
958} 1008}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 1009
964void 1010void
965rxvt_term::recolour_cursor () 1011rxvt_term::recolour_cursor ()
966{ 1012{
967 XColor xcol[2]; 1013 XColor fg, bg;
968 1014
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1015 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 1016 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 1017 : pix_colors_focused[Color_fg]).get (fg);
1018
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1019 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 1020 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 1021 : pix_colors_focused[Color_bg]).get (bg);
975 1022
976 XQueryColors (display->display, display->cmap, xcol, 2); 1023 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 1024}
979 1025
980/*----------------------------------------------------------------------*/ 1026/*----------------------------------------------------------------------*/
981/* 1027/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 1028 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 1029 */
984void 1030void
985rxvt_term::set_colorfgbg () 1031rxvt_term::set_colorfgbg ()
986{ 1032{
987 unsigned int i; 1033 unsigned int i;
988 const char *xpmb = "\0"; 1034 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1035 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 1036
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1037 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1038 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1040 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1041 {
… …
1000 1045
1001 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 1047 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 1048 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 1049 sprintf (bstr, "%d", (i - Color_Black));
1005#ifdef XPM_BACKGROUND 1050#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 1051 xpmb = "default;";
1007#endif 1052#endif
1008 break; 1053 break;
1009 } 1054 }
1010 1055
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1056 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 1057}
1013 1058
1014/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1015 1060
1016int 1061bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1062rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 1063{
1019 if (!screen_in_out->set (display, colour)) 1064 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 1065 return true;
1066
1067 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1068 return false;
1069}
1070
1071void
1072rxvt_term::alias_color (int dst, int src)
1073{
1074 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1026} 1075}
1027 1076
1028/* -------------------------------------------------------------------- * 1077/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 1078 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 1079 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 1082{
1034 int fix_screen; 1083 int fix_screen;
1035 int old_width = szHint.width; 1084 int old_width = szHint.width;
1036 int old_height = szHint.height; 1085 int old_height = szHint.height;
1037 dDisp;
1038 1086
1039 window_calc (newwidth, newheight); 1087 window_calc (newwidth, newheight);
1088
1089 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent[0], &szHint);
1041 1091
1042 if (!ignoreparent) 1092 if (!ignoreparent)
1043 { 1093 {
1044#ifdef SMART_RESIZE 1094#ifdef SMART_RESIZE
1045 /* 1095 /*
… …
1049 int x, y, x1, y1; 1099 int x, y, x1, y1;
1050 int dx, dy; 1100 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1101 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1102 Window unused_cr;
1053 1103
1054 XTranslateCoordinates (disp, parent[0], display->root, 1104 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1105 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1106 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1107 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1108 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1109 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1110 * our position for handles and decorations. Counter it
1061 */ 1111 */
… …
1063 { 1113 {
1064 x -= x1; 1114 x -= x1;
1065 y -= y1; 1115 y -= y1;
1066 } 1116 }
1067 1117
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1118 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1119 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1120 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1121 dy = old_height - szHint.height;
1072 1122
1073 /* Check position of the center of the window */ 1123 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1124 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1128 if (y < y1) /* top half */
1079 dy = 0; 1129 dy = 0;
1080 else if (y == y1) /* exact center */ 1130 else if (y == y1) /* exact center */
1081 dy /= 2; 1131 dy /= 2;
1082 1132
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1133 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1134 szHint.width, szHint.height);
1085#else 1135#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1136 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1137#endif
1088 } 1138 }
1089 1139
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1140 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1141
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1142 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1143 {
1094 if (scrollBar.state) 1144 if (scrollBar.state)
1095 { 1145 {
1096 XMoveResizeWindow (disp, scrollBar.win, 1146 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0, 1147 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 1148 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 1149 resize_scrollbar ();
1100 } 1150 }
1101 1151
1102 XMoveResizeWindow (disp, vt, 1152 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1153 window_vt_x, window_vt_y,
1104 width, height); 1154 width, height);
1105 1155
1156#ifdef HAVE_BG_PIXMAP
1157 if (bgPixmap.window_size_sensitive ())
1158 update_background ();
1159#endif
1160
1106 scr_clear (); 1161 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1162 }
1111 1163
1112 if (fix_screen || old_height == 0) 1164 if (fix_screen || old_height == 0)
1113 scr_reset (); 1165 scr_reset ();
1114 1166
1115#ifdef XPM_BACKGROUND 1167 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 if (pixmap) 1168 //scr_touch (false);
1169
1170#ifdef HAVE_BG_PIXMAP
1171// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1172// if (bgPixmap.pixmap)
1117 scr_touch (false); 1173// scr_touch (false);
1118#endif 1174#endif
1119 1175
1120#ifdef USE_XIM 1176#ifdef USE_XIM
1121 IMSetStatusPosition (); 1177 IMSetPosition ();
1122#endif 1178#endif
1123} 1179}
1124 1180
1125/* 1181/*
1126 * Set the width/height of the vt window in characters. Units are pixels. 1182 * Set the width/height of the vt window in characters. Units are pixels.
… …
1131{ 1187{
1132 XWindowAttributes wattr; 1188 XWindowAttributes wattr;
1133 1189
1134 if (newwidth == 0 || newheight == 0) 1190 if (newwidth == 0 || newheight == 0)
1135 { 1191 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1192 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1193
1138 if (newwidth == 0) 1194 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1195 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1196 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1197 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1211#ifdef USE_XIM
1156 1212
1157void 1213void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1214rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1215{
1160 fg = pix_colors[Color_fg]; 1216 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1217 bg = pix_colors [Color_bg];
1162} 1218}
1163 1219
1164void 1220void
1165rxvt_term::im_set_size (XRectangle &size) 1221rxvt_term::im_set_size (XRectangle &size)
1166{ 1222{
… …
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1259 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1204 1260
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1261 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1206 *p = '\0'; 1262 *p = '\0';
1207 1263
1208 atom = XInternAtom (display->display, server, False); 1264 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1265 win = XGetSelectionOwner (dpy, atom);
1210 1266
1211 if (win != None) 1267 if (win != None)
1212 return True; 1268 return True;
1213 } 1269 }
1214 1270
… …
1293 if (term->rs[Rs_imLocale]) 1349 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale); 1350 SET_LOCALE (term->locale);
1295 } 1351 }
1296 else 1352 else
1297 str = (void *)text->string.wide_char; 1353 str = (void *)text->string.wide_char;
1298 1354
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1355 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret, 1356 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first, 1357 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length, 1358 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1359 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1438 "*", 1494 "*",
1439 fheight, 1495 fheight,
1440 fheight + 1, fheight - 1, 1496 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1497 fheight - 2, fheight + 2);
1442 1498
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1499 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1500 &missing_charset_list, &missing_charset_count, &def_string);
1445 1501
1446 if (missing_charset_list) 1502 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1503 XFreeStringList (missing_charset_list);
1448 1504
… …
1489 XNBackground, bg, 1545 XNBackground, bg,
1490 XNArea, &status_rect, 1546 XNArea, &status_rect,
1491 XNFontSet, fs, 1547 XNFontSet, fs,
1492 NULL); 1548 NULL);
1493 } 1549 }
1550#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1551 else if (input_style & XIMPreeditCallbacks)
1495 { 1552 {
1496 im_set_position (spot); 1553 im_set_position (spot);
1497 1554
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1555 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1556 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1557 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1558# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1559 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1560# endif
1504 1561
1505 preedit_attr = XVaCreateNestedList (0, 1562 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1563 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1564 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1565 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1566 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1567# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1568 XNPreeditCaretCallback, &xcb[3],
1512#endif 1569# endif
1513 NULL); 1570 NULL);
1514 } 1571 }
1572#endif
1515 1573
1516 Input_Context = XCreateIC (xim, 1574 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1575 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1576 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1577 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1579 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1580 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1581 status_attr, NULL);
1524 1582
1525 if (preedit_attr) XFree (preedit_attr); 1583 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1584 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1585 if (fs) XFreeFontSet (dpy, fs);
1528 1586
1529 if (Input_Context == NULL) 1587 if (Input_Context == NULL)
1530 { 1588 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1589 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1590 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1595 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1596 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1597 vt_select_input ();
1540#endif 1598#endif
1541 1599
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1600 IMSetPosition ();
1544 1601
1545 return true; 1602 return true;
1546} 1603}
1547 1604
1548void 1605void
… …
1606 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1607#endif 1664#endif
1608} 1665}
1609 1666
1610void 1667void
1611rxvt_term::IMSetStatusPosition () 1668rxvt_term::IMSetPosition ()
1612{ 1669{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1670 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1671 XVaNestedList preedit_attr, status_attr;
1615 1672
1616 if (!Input_Context 1673 if (!Input_Context
1617 || !focus 1674 || !focus
1618 || !(input_style & XIMPreeditArea) 1675 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1676 || !IMisRunning ())
1620 return; 1677 return;
1621 1678
1679 if (input_style & XIMPreeditPosition)
1680 {
1681 im_set_size (preedit_rect);
1682 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1683
1684 XSetICValues (Input_Context,
1685 XNPreeditAttributes, preedit_attr, NULL);
1686 }
1687 else
1688 {
1622 /* Getting the necessary width of preedit area */ 1689 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1690 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1691 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1692 XFree (status_attr);
1626 1693
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1694 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1695 XFree (needed_rect);
1629 1696
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1697 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1698 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1699
1633 XSetICValues (Input_Context, 1700 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1701 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1702 XNStatusAttributes, status_attr,
1703 NULL);
1636 1704
1705 XFree (status_attr);
1706 }
1707
1637 XFree (preedit_attr); 1708 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1709}
1640#endif /* USE_XIM */ 1710#endif /* USE_XIM */
1711
1712void
1713rxvt_term::get_window_origin (int &x, int &y)
1714{
1715 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1718}
1719
1720Pixmap
1721rxvt_term::get_pixmap_property (int prop_id)
1722{
1723 if (prop_id > 0 && prop_id < NUM_XA)
1724 if (xa[prop_id])
1725 {
1726 int aformat;
1727 unsigned long nitems, bytes_after;
1728 Atom atype;
1729 unsigned char *prop = NULL;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP)
1734 {
1735 return *(Pixmap *)prop;
1736 }
1737 }
1738 return None;
1739}
1740
1741#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS
1743# undef update_background
1744int rxvt_term::trace_update_background (const char *file, int line)
1745{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background ();
1748}
1749# endif
1750
1751int
1752rxvt_term::update_background ()
1753{
1754 bgPixmap.invalidate ();
1755
1756 /* no chance of real time refresh if we are blurring! */
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1758 bgPixmap.render ();
1759 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering ())
1764 update_background_ev.start (.05);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772}
1773
1774void
1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{
1777 make_current ();
1778 bgPixmap.render ();
1779 refresh_check ();
1780}
1781
1782#endif /* HAVE_BG_PIXMAP */
1641 1783
1642/*----------------------- end-of-file (C source) -----------------------*/ 1784/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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