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

Diff Legend

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