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.196 by root, Sun Jan 22 04:01:52 2006 UTC vs.
Revision 1.274 by ayin, Tue Dec 11 11:53:48 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>
… …
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);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
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 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
186{ 197
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 199
189 termlist.push_back (this); 200 termlist.push_back (this);
190 201
191#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
193#endif 204#endif
194} 205}
195 206
196// clean up the most important stuff, do *not* call x or free mem etc. 207// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 208// for use before an emergency exit
209void
198void rxvt_term::emergency_cleanup () 210rxvt_term::emergency_cleanup ()
199{ 211{
200 if (cmd_pid) 212 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 213 kill (-cmd_pid, SIGHUP);
202 214
215 pty_ev.stop ();
203 delete pty; pty = 0; 216 delete pty; pty = 0;
204} 217}
205 218
206rxvt_term::~rxvt_term () 219rxvt_term::~rxvt_term ()
207{ 220{
… …
216#endif 229#endif
217 delete fontset[0]; 230 delete fontset[0];
218 231
219 if (display) 232 if (display)
220 { 233 {
221 dDisp;
222
223 selection_clear (); 234 selection_clear ();
224 235
225#ifdef USE_XIM 236#ifdef USE_XIM
226 im_destroy (); 237 im_destroy ();
227#endif 238#endif
228#ifdef XTERM_SCROLLBAR 239#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 242#endif
232#ifdef PLAIN_SCROLLBAR 243#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 245#endif
235#ifdef NEXT_SCROLLBAR 246#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 247 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 248 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 249 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 250 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 251 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 252 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 253 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 254 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 257#endif
247#ifdef RXVT_SCROLLBAR 258#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 262#endif
252 if (gc) XFreeGC (disp, gc); 263 if (gc) XFreeGC (dpy, gc);
253 264
254 delete drawable; 265 delete drawable;
255 // destroy all windows 266 // destroy all windows
256 if (parent[0]) 267 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 268 XDestroyWindow (dpy, parent[0]);
258 }
259 269
260 // TODO: free pixcolours, colours should become part of rxvt_display 270 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 271 if (ISSET_PIXCOLOR (i))
272 {
273 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 274#if OFF_FOCUS_FADING
275 pix_colors_unfocused [i].free (this);
276#endif
277 }
278
279 clear ();
280 }
281
282 delete [] pix_colors_focused;
283#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 284 delete [] pix_colors_unfocused;
264#endif 285#endif
265 286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
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 (ev_is_active (&destroy_ev))
308 return; 333 return;
309 334
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 336
313#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
314 scr_overlay_off (); 338 scr_overlay_off ();
315#endif 339#endif
316 340
… …
320 im_ev.stop (display); 344 im_ev.stop (display);
321#endif 345#endif
322#if HAVE_SCROLLBARS 346#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 347 scrollbar_ev.stop (display);
324#endif 348#endif
325#if TRANSPARENT 349#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 350 rootwin_ev.stop (display);
327#endif 351#endif
328 incr_ev.stop (); 352 incr_ev.stop ();
329 termwin_ev.stop (display); 353 termwin_ev.stop (display);
330 vt_ev.stop (display); 354 vt_ev.stop (display);
331 } 355 }
332 356
333 check_ev.stop (); 357 prepare_ev.stop ();
334 pty_ev.stop (); 358 pty_ev.stop ();
335#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
337#endif 361#endif
338#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
346#endif 370#endif
347#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
348 pointer_ev.stop (); 372 pointer_ev.stop ();
349#endif 373#endif
350 374
351 destroy_ev.start (0); 375 destroy_ev.start ();
352} 376}
353 377
354void 378void
355rxvt_term::destroy_cb (time_watcher &w) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 380{
357 make_current (); 381 make_current ();
358 382
359 delete this; 383 delete this;
360} 384}
… …
371{ 395{
372 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++)
373 (*t)->emergency_cleanup (); 397 (*t)->emergency_cleanup ();
374} 398}
375 399
376#if ENABLE_FRILLS 400#if !ENABLE_MINIMAL
377static void 401static void
378print_x_error (Display *dpy, XErrorEvent *event) 402print_x_error (Display *dpy, XErrorEvent *event)
379{ 403{
380 char buffer[BUFSIZ]; 404 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 405 char mesg[BUFSIZ];
… …
414 else 438 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 440 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 442 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 444 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 446}
423#endif 447#endif
424 448
… …
429 GET_R->allowedxerror = event->error_code; 453 GET_R->allowedxerror = event->error_code;
430 else 454 else
431 { 455 {
432 // 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,
433 // so just output the error and continue 457 // so just output the error and continue
434#if ENABLE_FRILLS 458#if ENABLE_MINIMAL
459 old_xerror_handler (display, event);
460#else
435 print_x_error (display, event); 461 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 462#endif
439 } 463 }
440 464
441 return 0; 465 return 0;
442} 466}
… …
470#ifdef KEYSYM_RESOURCE 494#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 495 keyboard->register_done ();
472#endif 496#endif
473 497
474#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 499 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 500 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 501#endif
478 502
479 pty = ptytty::create (); 503 pty = ptytty::create ();
480 504
481 create_windows (argc, argv); 505 create_windows (argc, argv);
482 506
483 dDisp;
484
485 init_xlocale (); 507 init_xlocale ();
486 508
487 scr_reset (); // initialize screen 509 scr_reset (); // initialize screen
488 510
489#if 0 511#if 0
490 XSynchronize (disp, True); 512 XSynchronize (dpy, True);
491#endif 513#endif
492 514
493#ifdef HAVE_SCROLLBARS 515#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 516 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 517 resize_scrollbar (); /* create and map scrollbar */
496#endif 518#endif
519#ifdef HAVE_BG_PIXMAP
520 {
521 bgPixmap.set_target (this);
522
497#ifdef TRANSPARENT 523#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 524 if (option (Opt_transparent))
499 { 525 {
526 bgPixmap.set_transparent ();
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 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]);
535
536 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 537 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 538 rootwin_ev.start (display, display->root);
503 } 539 }
540#endif
541
542#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL)
544 {
545 const char *p = rs[Rs_backgroundPixmap];
546
547 if ((p = strchr (p, ';')) != NULL)
548 {
549 p++;
550 bgPixmap.set_geometry (p);
551 }
552 else
553 bgPixmap.set_defaultGeometry ();
554
555 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556 if (!bgPixmap.window_position_sensitive ())
557 update_background ();
558 }
559#endif
560 }
561#endif
562
563#if ENABLE_PERL
564 rootwin_ev.start (display, display->root);
504#endif 565#endif
505 566
506 set_colorfgbg (); 567 set_colorfgbg ();
507 568
508 init_command (cmd_argv); 569 init_command (cmd_argv);
509 570
510 free (cmd_argv); 571 free (cmd_argv);
511 572
512 if (pty->pty >= 0) 573 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ); 574 pty_ev.start (pty->pty, ev::READ);
514 575
515 check_ev.start (); 576 prepare_ev.start ();
516 577
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 578 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 579
580#if ENABLE_XEMBED
581 if (rs[Rs_embed])
582 {
583 long info[2] = { 0, XEMBED_MAPPED };
584
585 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586 32, PropModeReplace, (unsigned char *)&info, 2);
587 }
588#endif
589
519 XMapWindow (disp, vt); 590 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 591 XMapWindow (dpy, parent[0]);
521 592
522 return true; 593 return true;
523} 594}
524 595
525static struct sig_handlers 596static struct sig_handlers
526{ 597{
527 sig_watcher sw_term, sw_int; 598 ev::sig sw_term, sw_int;
528 599
529 /* 600 /*
530 * Catch a fatal signal and tidy up before quitting 601 * Catch a fatal signal and tidy up before quitting
531 */ 602 */
532 void 603 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 604
605 sig_handlers ()
534 { 606 {
535#ifdef DEBUG_CMD 607 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term) 608 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
546 {
547 } 609 }
548} sig_handlers; 610} sig_handlers;
549 611
612void
613sig_handlers::sig_term (ev::sig &w, int revents)
614{
615 rxvt_emergency_cleanup ();
616 w.stop ();
617 kill (getpid (), w.signum);
618}
619
550char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
551 621
552void 622void
553rxvt_init () 623rxvt_init ()
554{ 624{
555 ptytty::init (); 625 ptytty::init ();
626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
556 629
557 rxvt_environ = environ; 630 rxvt_environ = environ;
558 631
559 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
560 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
561 634
562 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
563 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
564 637
565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
566 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
567 640
568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
608 return p; 681 return p;
609} 682}
610 683
611/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
612/* 685/*
613 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
614 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
615 */ 688 */
616void 689void
617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
618{ 691{
619 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
620 int x, y, sb_w, flags; 693 int x, y, sb_w, flags;
621 unsigned int w, h; 694 unsigned int w, h;
622 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
623 dDisp;
624
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627 696
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 700
… …
693 762
694 if (scrollBar.state) 763 if (scrollBar.state)
695 { 764 {
696 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
697 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
698 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
699 window_vt_x += sb_w; 769 window_vt_x += sb_w;
700 } 770 }
701 771
702 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
703 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
704 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
705 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
706 776
707 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
708 { 778 {
709 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
724 { 794 {
725 min_it (height, max_height); 795 min_it (height, max_height);
726 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
727 } 797 }
728 798
729 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
730 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
731 801
732 if (recalc_x) 802 if (recalc_x)
733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
734 if (recalc_y) 805 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 807
737 ncol = width / fwidth; 808 ncol = width / fwidth;
738 nrow = height / fheight; 809 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 810}
744 811
745/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
746/* 813/*
747 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
… …
760 ws.ws_xpixel = width; 827 ws.ws_xpixel = width;
761 ws.ws_ypixel = height; 828 ws.ws_ypixel = height;
762 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
763 830
764#if 0 831#if 0
765 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 832 // TIOCSWINSZ is supposed to do this automatically and correctly
766 if (cmd_pid) /* force through to the command */ 833 if (cmd_pid) /* force through to the command */
767 kill (-cmd_pid, SIGWINCH); 834 kill (-cmd_pid, SIGWINCH);
768#endif 835#endif
769} 836}
770 837
… …
799 delete fontset[0]; 866 delete fontset[0];
800 fontset[0] = fs; 867 fontset[0] = fs;
801 868
802 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
803 prop.height += lineSpace; 870 prop.height += lineSpace;
871
804 fs->set_prop (prop); 872 fs->set_prop (prop, false);
805 873
806 fwidth = prop.width; 874 fwidth = prop.width;
807 fheight = prop.height; 875 fheight = prop.height;
808 fbase = prop.ascent; 876 fbase = prop.ascent;
809 877
… …
818 { 886 {
819 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
820 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
821 889
822 if (res) 890 if (res)
823 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
824 else 895 else
825 { 896 {
826 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
827 898
828 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 899 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
829 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 900 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
901
902 fs->set_prop (prop2, true);
830 } 903 }
831 904
832 fs->populate (res);
833 fs->set_prop (prop2);
834 } 905 }
835#else 906#else
836 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
837#endif 908#endif
838 } 909 }
… …
840 if (parent[0]) 911 if (parent[0])
841 { 912 {
842 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
843 scr_remap_chars (); 914 scr_remap_chars ();
844 scr_touch (true); 915 scr_touch (true);
845 } 916 }
846 917
847 return true; 918 return true;
848} 919}
849 920
921void
850void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
851{ 923{
852 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
853 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
854 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
855} 927}
856 928
929void
857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
858{ 931{
859 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
860 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
861 934
862 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
864 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
865 938
866 free (s); 939 free (s);
867 free (ws); 940 free (ws);
… …
886#if ENABLE_EWMH 959#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
888#endif 961#endif
889} 962}
890 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
891#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
892void
893rxvt_term::set_window_color (int idx, const char *color)
894{
895 rxvt_color xcol; 968 rxvt_color xcol;
896 int i; 969 int i;
897 970
898 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
899 return; 972 return;
900 973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
977
901 /* handle color aliases */ 978 /* handle color aliases */
902 if (isdigit (*color)) 979 if (isdigit (*color))
903 { 980 {
904 i = atoi (color); 981 i = atoi (color);
905 982
906 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
907 { /* bright colors */ 985 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 SET_PIXCOLOR (idx);
911 goto done; 987 goto done;
912 } 988 }
913 989
914 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
915 { /* normal colors */ 992 /* normal colors */
916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
917 SET_PIXCOLOR (idx);
918 goto done; 994 goto done;
919 } 995 }
920 } 996 }
921 997
922 if (!rXParseAllocColor (&xcol, color)) 998 set_color (xcol, color);
923 return;
924
925 /* XStoreColor (display->display, display->cmap, XColor*); */
926 999
927 /* 1000 /*
928 * FIXME: should free colors here, but no idea how to do it so instead, 1001 * FIXME: should free colors here, but no idea how to do it so instead,
929 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
930 */ 1003 */
931# if 0
932 for (i = Color_Black; i <= Color_White; i++)
933 if (pix_colors[idx] == pix_colors[i])
934 break;
935 if (i > Color_White)
936 {
937 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
938 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
939 DisplayPlanes (display->display, display->screen));
940 }
941# endif
942 1004
943 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
944 SET_PIXCOLOR (idx);
945 1006
946 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */
948done: 1007done:
949
950#if OFF_FOCUS_FADING
951 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif
954
955 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
956 1009
1010 update_fade_color (idx);
957 recolour_cursor (); 1011 recolour_cursor ();
958 scr_recolour (); 1012 scr_recolour ();
1013#endif /* XTERM_COLOR_CHANGE */
959} 1014}
960
961#else
962# define set_window_color (idx,color) ((void)0)
963#endif /* XTERM_COLOR_CHANGE */
964 1015
965void 1016void
966rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
967{ 1018{
968 XColor xcol[2]; 1019 XColor fg, bg;
969 1020
970 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1021 (ISSET_PIXCOLOR (Color_pointer_fg)
971 ? pix_colors_focused[Color_pointer_fg] 1022 ? pix_colors_focused[Color_pointer_fg]
972 : pix_colors_focused[Color_fg]; 1023 : pix_colors_focused[Color_fg]).get (fg);
1024
973 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1025 (ISSET_PIXCOLOR (Color_pointer_bg)
974 ? pix_colors_focused[Color_pointer_bg] 1026 ? pix_colors_focused[Color_pointer_bg]
975 : pix_colors_focused[Color_bg]; 1027 : pix_colors_focused[Color_bg]).get (bg);
976 1028
977 XQueryColors (display->display, display->cmap, xcol, 2); 1029 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
979} 1030}
980 1031
981/*----------------------------------------------------------------------*/ 1032/*----------------------------------------------------------------------*/
982/* 1033/*
983 * find if fg/bg matches any of the normal (low-intensity) colors 1034 * find if fg/bg matches any of the normal (low-intensity) colors
984 */ 1035 */
985void 1036void
986rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
987{ 1038{
988 unsigned int i; 1039 unsigned int i;
989 const char *xpmb = "\0"; 1040 const char *xpmb = "";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 1042
992 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
993 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
994 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
995 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
996 if (pix_colors[Color_fg] == pix_colors[i]) 1046 if (pix_colors[Color_fg] == pix_colors[i])
997 { 1047 {
… …
1001 1051
1002 for (i = Color_Black; i <= Color_White; i++) 1052 for (i = Color_Black; i <= Color_White; i++)
1003 if (pix_colors[Color_bg] == pix_colors[i]) 1053 if (pix_colors[Color_bg] == pix_colors[i])
1004 { 1054 {
1005 sprintf (bstr, "%d", (i - Color_Black)); 1055 sprintf (bstr, "%d", (i - Color_Black));
1006#ifdef XPM_BACKGROUND 1056#ifdef BG_IMAGE_FROM_FILE
1007 xpmb = "default;"; 1057 xpmb = "default;";
1008#endif 1058#endif
1009 break; 1059 break;
1010 } 1060 }
1011 1061
1012 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1062 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1013} 1063}
1014 1064
1015/*----------------------------------------------------------------------*/ 1065/*----------------------------------------------------------------------*/
1016 1066
1017int 1067bool
1018rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1068rxvt_term::set_color (rxvt_color &color, const char *name)
1019{ 1069{
1020 if (!screen_in_out->set (display, colour)) 1070 if (color.set (this, name))
1021 {
1022 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1023 return false;
1024 }
1025
1026 return true; 1071 return true;
1072
1073 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1074 return false;
1075}
1076
1077void
1078rxvt_term::alias_color (int dst, int src)
1079{
1080 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1027} 1081}
1028 1082
1029/* -------------------------------------------------------------------- * 1083/* -------------------------------------------------------------------- *
1030 * - WINDOW RESIZING - * 1084 * - WINDOW RESIZING - *
1031 * -------------------------------------------------------------------- */ 1085 * -------------------------------------------------------------------- */
1032void 1086void
1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1087rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1034{ 1088{
1035 int fix_screen; 1089 int fix_screen;
1036 int old_width = szHint.width, old_height = szHint.height; 1090 int old_width = szHint.width;
1037 dDisp; 1091 int old_height = szHint.height;
1038 1092
1039 window_calc (newwidth, newheight); 1093 window_calc (newwidth, newheight);
1094
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1096 XSetWMNormalHints (dpy, parent[0], &szHint);
1041 1097
1042 if (!ignoreparent) 1098 if (!ignoreparent)
1043 { 1099 {
1044#ifdef SMART_RESIZE 1100#ifdef SMART_RESIZE
1045 /* 1101 /*
… …
1049 int x, y, x1, y1; 1105 int x, y, x1, y1;
1050 int dx, dy; 1106 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1108 Window unused_cr;
1053 1109
1054 XTranslateCoordinates (disp, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1114 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1115 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
1061 */ 1117 */
… …
1063 { 1119 {
1064 x -= x1; 1120 x -= x1;
1065 y -= y1; 1121 y -= y1;
1066 } 1122 }
1067 1123
1068 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1124 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1125 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1126 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1127 dy = old_height - szHint.height;
1072 1128
1073 /* Check position of the center of the window */ 1129 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1130 if (x < x1) /* left half */
1075 dx = 0; 1131 dx = 0;
… …
1078 if (y < y1) /* top half */ 1134 if (y < y1) /* top half */
1079 dy = 0; 1135 dy = 0;
1080 else if (y == y1) /* exact center */ 1136 else if (y == y1) /* exact center */
1081 dy /= 2; 1137 dy /= 2;
1082 1138
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1139 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1140 szHint.width, szHint.height);
1085#else 1141#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1143#endif
1088 } 1144 }
1089 1145
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1147
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1148 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1149 {
1094 if (scrollBar.state) 1150 if (scrollBar.state)
1095 { 1151 {
1096 XMoveResizeWindow (disp, scrollBar.win, 1152 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0, 1153 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 1154 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 1155 resize_scrollbar ();
1100 } 1156 }
1101 1157
1102 XMoveResizeWindow (disp, vt, 1158 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1104 width, height); 1160 width, height);
1105 1161
1162#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ())
1164 update_background ();
1165#endif
1166
1106 scr_clear (); 1167 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1168 }
1111 1169
1112 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1113 {
1114 int curr_screen = -1;
1115 int old_ncol = prev_ncol;
1116
1117 /* scr_reset only works on the primary screen */
1118 if (old_height) /* this is not the first time through */
1119 {
1120 unsigned int ocol = ncol;
1121 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1122 curr_screen = scr_change_screen (PRIMARY);
1123 ncol = ocol;
1124 }
1125
1126 scr_reset (); 1171 scr_reset ();
1127 1172
1128 if (curr_screen >= 0) /* this is not the first time through */ 1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1129 { 1174 //scr_touch (false);
1130 scr_change_screen (curr_screen);
1131 selection_check (old_ncol != ncol ? 4 : 0);
1132 }
1133 }
1134 1175
1135 old_width = szHint.width; 1176#ifdef HAVE_BG_PIXMAP
1136 old_height = szHint.height; 1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137 1178// if (bgPixmap.pixmap)
1138#ifdef XPM_BACKGROUND
1139 if (pixmap)
1140 scr_touch (false); 1179// scr_touch (false);
1141#endif 1180#endif
1142 1181
1143#ifdef USE_XIM 1182#ifdef USE_XIM
1144 IMSetStatusPosition (); 1183 IMSetPosition ();
1145#endif 1184#endif
1146} 1185}
1147 1186
1148/* 1187/*
1149 * Set the width/height of the vt window in characters. Units are pixels. 1188 * Set the width/height of the vt window in characters. Units are pixels.
… …
1154{ 1193{
1155 XWindowAttributes wattr; 1194 XWindowAttributes wattr;
1156 1195
1157 if (newwidth == 0 || newheight == 0) 1196 if (newwidth == 0 || newheight == 0)
1158 { 1197 {
1159 XGetWindowAttributes (display->display, display->root, &wattr); 1198 XGetWindowAttributes (dpy, display->root, &wattr);
1160 1199
1161 if (newwidth == 0) 1200 if (newwidth == 0)
1162 newwidth = wattr.width - szHint.base_width; 1201 newwidth = wattr.width - szHint.base_width;
1163 if (newheight == 0) 1202 if (newheight == 0)
1164 newheight = wattr.height - szHint.base_height; 1203 newheight = wattr.height - szHint.base_height;
… …
1178#ifdef USE_XIM 1217#ifdef USE_XIM
1179 1218
1180void 1219void
1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1220rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1182{ 1221{
1183 fg = pix_colors[Color_fg]; 1222 fg = pix_colors [Color_fg];
1184 bg = pix_colors[Color_bg]; 1223 bg = pix_colors [Color_bg];
1185} 1224}
1186 1225
1187void 1226void
1188rxvt_term::im_set_size (XRectangle &size) 1227rxvt_term::im_set_size (XRectangle &size)
1189{ 1228{
… …
1226 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1227 1266
1228 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1229 *p = '\0'; 1268 *p = '\0';
1230 1269
1231 atom = XInternAtom (display->display, server, False); 1270 atom = XInternAtom (dpy, server, False);
1232 win = XGetSelectionOwner (display->display, atom); 1271 win = XGetSelectionOwner (dpy, atom);
1233 1272
1234 if (win != None) 1273 if (win != None)
1235 return True; 1274 return True;
1236 } 1275 }
1237 1276
… …
1244 XPoint nspot; 1283 XPoint nspot;
1245 XVaNestedList preedit_attr; 1284 XVaNestedList preedit_attr;
1246 1285
1247 if (!Input_Context 1286 if (!Input_Context
1248 || !focus 1287 || !focus
1249 || !(input_style & XIMPreeditPosition)) 1288 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1250 return; 1289 return;
1251 1290
1252 im_set_position (nspot); 1291 im_set_position (nspot);
1253 1292
1254 if (nspot.x == spot.x && nspot.y == spot.y) 1293 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1273 input_method = 0; 1312 input_method = 0;
1274 } 1313 }
1275 1314
1276 Input_Context = 0; 1315 Input_Context = 0;
1277} 1316}
1317
1318#ifdef ENABLE_XIM_ONTHESPOT
1319
1320static void
1321xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1325}
1326
1327static void
1328xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1329{
1330 ((rxvt_term *)client_data)->make_current ();
1331 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1332}
1333
1334static void
1335xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1336{
1337 rxvt_term *term = (rxvt_term *)client_data;
1338 XIMText *text = call_data->text;
1339
1340 term->make_current ();
1341
1342 if (text)
1343 {
1344 void *str;
1345
1346 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 {
1348 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]);
1351
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1354
1355 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale);
1357 }
1358 else
1359 str = (void *)text->string.wide_char;
1360
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length,
1365 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1366 DT_WCS_LEN, str, str ? (int)text->length : 0,
1367 DT_END));
1368 }
1369 else
1370 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1371 DT_INT, call_data->caret,
1372 DT_INT, call_data->chg_first,
1373 DT_INT, call_data->chg_length,
1374 DT_END));
1375}
1376
1377#if 0
1378static void
1379xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1380{
1381 ((rxvt_term *)client_data)->make_current ();
1382 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1383 DT_INT, call_data->position,
1384 DT_INT, call_data->direction,
1385 DT_INT, call_data->style,
1386 DT_END));
1387}
1388#endif
1389
1390#endif
1278 1391
1279/* 1392/*
1280 * Try to open a XIM with the current modifiers, then see if we can 1393 * Try to open a XIM with the current modifiers, then see if we can
1281 * open a suitable preedit type 1394 * open a suitable preedit type
1282 */ 1395 */
… …
1289 XRectangle rect, status_rect, needed_rect; 1402 XRectangle rect, status_rect, needed_rect;
1290 unsigned long fg, bg; 1403 unsigned long fg, bg;
1291 const char *p; 1404 const char *p;
1292 char **s; 1405 char **s;
1293 XIMStyles *xim_styles; 1406 XIMStyles *xim_styles;
1407#ifdef ENABLE_XIM_ONTHESPOT
1408 XIMCallback xcb[4];
1409#endif
1294 1410
1295 set_environ (envv); 1411 set_environ (envv);
1296 1412
1297 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1413 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1298 return false; 1414 return false;
1299 1415
1300 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1301 input_method = display->get_xim (locale, modifiers); 1416 input_method = display->get_xim (locale, modifiers);
1302 if (input_method == NULL) 1417 if (input_method == NULL)
1303 return false; 1418 return false;
1304 1419
1305 xim = input_method->xim; 1420 xim = input_method->xim;
… …
1325 s = rxvt_splitcommastring (p); 1440 s = rxvt_splitcommastring (p);
1326 1441
1327 for (i = found = 0; !found && s[i]; i++) 1442 for (i = found = 0; !found && s[i]; i++)
1328 { 1443 {
1329 if (!strcmp (s[i], "OverTheSpot")) 1444 if (!strcmp (s[i], "OverTheSpot"))
1330 input_style = (XIMPreeditPosition | XIMStatusNothing); 1445 input_style = XIMPreeditPosition | XIMStatusNothing;
1331 else if (!strcmp (s[i], "OffTheSpot")) 1446 else if (!strcmp (s[i], "OffTheSpot"))
1332 input_style = (XIMPreeditArea | XIMStatusArea); 1447 input_style = XIMPreeditArea | XIMStatusArea;
1333 else if (!strcmp (s[i], "Root")) 1448 else if (!strcmp (s[i], "Root"))
1334 input_style = (XIMPreeditNothing | XIMStatusNothing); 1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1335 else if (!strcmp (s[i], "None")) 1450 else if (!strcmp (s[i], "None"))
1336 input_style = (XIMPreeditNone | XIMStatusNone); 1451 input_style = XIMPreeditNone | XIMStatusNone;
1452#ifdef ENABLE_XIM_ONTHESPOT
1453 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1454 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1455#endif
1456 else
1457 input_style = XIMPreeditNothing | XIMStatusNothing;
1337 1458
1338 for (j = 0; j < xim_styles->count_styles; j++) 1459 for (j = 0; j < xim_styles->count_styles; j++)
1339 if (input_style == xim_styles->supported_styles[j]) 1460 if (input_style == xim_styles->supported_styles[j])
1340 { 1461 {
1341 rxvt_freecommastring (s); 1462 rxvt_freecommastring (s);
… …
1379 "*", 1500 "*",
1380 fheight, 1501 fheight,
1381 fheight + 1, fheight - 1, 1502 fheight + 1, fheight - 1,
1382 fheight - 2, fheight + 2); 1503 fheight - 2, fheight + 2);
1383 1504
1384 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1505 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1506 &missing_charset_list, &missing_charset_count, &def_string);
1386 1507
1387 if (missing_charset_list) 1508 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1509 XFreeStringList (missing_charset_list);
1389 1510
… …
1430 XNBackground, bg, 1551 XNBackground, bg,
1431 XNArea, &status_rect, 1552 XNArea, &status_rect,
1432 XNFontSet, fs, 1553 XNFontSet, fs,
1433 NULL); 1554 NULL);
1434 } 1555 }
1556#if ENABLE_XIM_ONTHESPOT
1557 else if (input_style & XIMPreeditCallbacks)
1558 {
1559 im_set_position (spot);
1560
1561 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1562 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1563 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1564# if 0
1565 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1566# endif
1567
1568 preedit_attr = XVaCreateNestedList (0,
1569 XNSpotLocation, &spot,
1570 XNPreeditStartCallback, &xcb[0],
1571 XNPreeditDoneCallback , &xcb[1],
1572 XNPreeditDrawCallback , &xcb[2],
1573# if 0
1574 XNPreeditCaretCallback, &xcb[3],
1575# endif
1576 NULL);
1577 }
1578#endif
1435 1579
1436 Input_Context = XCreateIC (xim, 1580 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1581 XNInputStyle, input_style,
1438 XNClientWindow, vt, 1582 XNClientWindow, vt,
1439 XNFocusWindow, parent[0], 1583 XNFocusWindow, parent[0],
… …
1441 preedit_attr, 1585 preedit_attr,
1442 status_attr ? XNStatusAttributes : NULL, 1586 status_attr ? XNStatusAttributes : NULL,
1443 status_attr, NULL); 1587 status_attr, NULL);
1444 1588
1445 if (preedit_attr) XFree (preedit_attr); 1589 if (preedit_attr) XFree (preedit_attr);
1446 if (status_attr) XFree (status_attr); 1590 if (status_attr) XFree (status_attr);
1447 if (fs) XFreeFontSet (display->display, fs); 1591 if (fs) XFreeFontSet (dpy, fs);
1448 1592
1449 if (Input_Context == NULL) 1593 if (Input_Context == NULL)
1450 { 1594 {
1451 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1595 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1452 im_destroy (); 1596 im_destroy ();
1453 return false; 1597 return false;
1454 } 1598 }
1455 1599
1456 if (input_style & XIMPreeditArea) 1600#if 0
1601 // unfortunately, only the focus window is used by XIM, hard to fix
1602 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1603 vt_select_input ();
1604#endif
1605
1457 IMSetStatusPosition (); 1606 IMSetPosition ();
1458 1607
1459 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1460 return true; 1608 return true;
1461} 1609}
1462 1610
1463void 1611void
1464rxvt_term::im_cb () 1612rxvt_term::im_cb ()
… …
1470 1618
1471 make_current (); 1619 make_current ();
1472 1620
1473 im_destroy (); 1621 im_destroy ();
1474 1622
1475 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1476 if (Input_Context) 1623 if (Input_Context)
1477 return; 1624 return;
1478 1625
1479#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1480 if (rs[Rs_imLocale]) 1627 if (rs[Rs_imLocale])
… …
1522 SET_LOCALE (locale); 1669 SET_LOCALE (locale);
1523#endif 1670#endif
1524} 1671}
1525 1672
1526void 1673void
1527rxvt_term::IMSetStatusPosition () 1674rxvt_term::IMSetPosition ()
1528{ 1675{
1529 XRectangle preedit_rect, status_rect, *needed_rect; 1676 XRectangle preedit_rect, status_rect, *needed_rect;
1530 XVaNestedList preedit_attr, status_attr; 1677 XVaNestedList preedit_attr, status_attr;
1531 1678
1532 if (!Input_Context 1679 if (!Input_Context
1533 || !focus 1680 || !focus
1534 || !(input_style & XIMPreeditArea) 1681 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1535 || !IMisRunning ()) 1682 || !IMisRunning ())
1536 return; 1683 return;
1537 1684
1685 if (input_style & XIMPreeditPosition)
1686 {
1687 im_set_size (preedit_rect);
1688 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1689
1690 XSetICValues (Input_Context,
1691 XNPreeditAttributes, preedit_attr, NULL);
1692 }
1693 else
1694 {
1538 /* Getting the necessary width of preedit area */ 1695 /* Getting the necessary width of preedit area */
1539 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1540 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1697 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1541 XFree (status_attr); 1698 XFree (status_attr);
1542 1699
1543 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1700 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1544 XFree (needed_rect); 1701 XFree (needed_rect);
1545 1702
1546 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1703 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1547 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1704 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1548 1705
1549 XSetICValues (Input_Context, 1706 XSetICValues (Input_Context,
1550 XNPreeditAttributes, preedit_attr, 1707 XNPreeditAttributes, preedit_attr,
1551 XNStatusAttributes, status_attr, NULL); 1708 XNStatusAttributes, status_attr,
1709 NULL);
1552 1710
1711 XFree (status_attr);
1712 }
1713
1553 XFree (preedit_attr); 1714 XFree (preedit_attr);
1554 XFree (status_attr);
1555} 1715}
1556#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1717
1718void
1719rxvt_term::get_window_origin (int &x, int &y)
1720{
1721 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724}
1725
1726Pixmap
1727rxvt_term::get_pixmap_property (int prop_id)
1728{
1729 if (prop_id > 0 && prop_id < NUM_XA)
1730 if (xa[prop_id])
1731 {
1732 int aformat;
1733 unsigned long nitems, bytes_after;
1734 Atom atype;
1735 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop;
1742 }
1743 }
1744 return None;
1745}
1746
1747#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756
1757int
1758rxvt_term::update_background ()
1759{
1760 bgPixmap.invalidate ();
1761
1762 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render ();
1765 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778}
1779
1780void
1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{
1783 bgPixmap.render ();
1784}
1785
1786#endif /* HAVE_BG_PIXMAP */
1557 1787
1558/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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