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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.281 by root, Fri Dec 14 02:10:33 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); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 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 (destroy_ev.is_active ())
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}
… …
449 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
451} 475}
452 476
453/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
454bool 478void
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 480{
457 this->envv = envv; 481 this->envv = envv;
458 482
459 SET_R (this); 483 SET_R (this);
460 set_locale (""); 484 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
462 486
463 if (!init_vars ()) 487 init_vars ();
464 return false;
465 488
466 init_secondary (); 489 init_secondary ();
467 490
468 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
469 492
470#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 494 keyboard->register_done ();
472#endif 495#endif
473 496
474#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 500#endif
478 501
479 pty = ptytty::create (); 502 pty = ptytty::create ();
480 503
481 create_windows (argc, argv); 504 create_windows (argc, argv);
482 505
483 dDisp;
484
485 init_xlocale (); 506 init_xlocale ();
486 507
487 scr_reset (); // initialize screen 508 scr_reset (); // initialize screen
488 509
489#if 0 510#if 0
490 XSynchronize (disp, True); 511 XSynchronize (dpy, True);
491#endif 512#endif
492 513
493#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
496#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
497#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
499 { 524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
503 } 538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
504#endif 564#endif
505 565
506 set_colorfgbg (); 566 set_colorfgbg ();
507 567
508 init_command (cmd_argv); 568 init_command (cmd_argv);
509 569
510 free (cmd_argv); 570 free (cmd_argv);
511 571
512 if (pty->pty >= 0) 572 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
514 574
515 check_ev.start (); 575 prepare_ev.start ();
516 576
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
519 XMapWindow (disp, vt); 589 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 590 XMapWindow (dpy, parent[0]);
521
522 return true;
523} 591}
524 592
525static struct sig_handlers 593static struct sig_handlers
526{ 594{
527 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
528 596
529 /* 597 /*
530 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
531 */ 599 */
532 void 600 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 601
602 sig_handlers ()
534 { 603 {
535 rxvt_emergency_cleanup (); 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 signal (w.signum, SIG_DFL);
537 kill (getpid (), w.signum);
538 }
539
540 sig_handlers ()
541 : sw_term (this, &sig_handlers::sig_term),
542 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
543 {
544 } 606 }
545} sig_handlers; 607} sig_handlers;
546 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
547char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
548 618
549void 619void
550rxvt_init () 620rxvt_init ()
551{ 621{
552 ptytty::init (); 622 ptytty::init ();
623
624 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
553 626
554 rxvt_environ = environ; 627 rxvt_environ = environ;
555 628
556 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
557 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
558 631
559 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
560 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
561 634
562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
563 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
564 637
565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
605 return p; 678 return p;
606} 679}
607 680
608/*----------------------------------------------------------------------*/ 681/*----------------------------------------------------------------------*/
609/* 682/*
610 * window size/position calculcations for XSizeHint and other storage. 683 * window size/position calculations for XSizeHint and other storage.
611 * if width/height are non-zero then override calculated width/height 684 * if width/height are non-zero then override calculated width/height
612 */ 685 */
613void 686void
614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
615{ 688{
616 short recalc_x, recalc_y; 689 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 690 int x, y, sb_w, flags;
618 unsigned int w, h; 691 unsigned int w, h;
619 unsigned int max_width, max_height; 692 unsigned int max_width, max_height;
620 dDisp;
621 693
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 695 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 696 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 697
… …
687 759
688 if (scrollBar.state) 760 if (scrollBar.state)
689 { 761 {
690 sb_w = scrollbar_TotalWidth (); 762 sb_w = scrollbar_TotalWidth ();
691 szHint.base_width += sb_w; 763 szHint.base_width += sb_w;
764
692 if (!OPTION (Opt_scrollBar_right)) 765 if (!option (Opt_scrollBar_right))
693 window_vt_x += sb_w; 766 window_vt_x += sb_w;
694 } 767 }
695 768
696 szHint.width_inc = fwidth; 769 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 770 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 771 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 772 szHint.min_height = szHint.base_height + szHint.height_inc;
700 773
701 if (newwidth && newwidth - szHint.base_width < max_width) 774 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 775 {
703 szHint.width = newwidth; 776 szHint.width = newwidth;
… …
718 { 791 {
719 min_it (height, max_height); 792 min_it (height, max_height);
720 szHint.height = szHint.base_height + height; 793 szHint.height = szHint.base_height + height;
721 } 794 }
722 795
723 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 796 if (scrollBar.state && option (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w; 797 window_sb_x = szHint.width - sb_w;
725 798
726 if (recalc_x) 799 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801
728 if (recalc_y) 802 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 804
731 ncol = width / fwidth; 805 ncol = width / fwidth;
732 nrow = height / fheight; 806 nrow = height / fheight;
733} 807}
734 808
… …
750 ws.ws_xpixel = width; 824 ws.ws_xpixel = width;
751 ws.ws_ypixel = height; 825 ws.ws_ypixel = height;
752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
753 827
754#if 0 828#if 0
755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 829 // TIOCSWINSZ is supposed to do this automatically and correctly
756 if (cmd_pid) /* force through to the command */ 830 if (cmd_pid) /* force through to the command */
757 kill (-cmd_pid, SIGWINCH); 831 kill (-cmd_pid, SIGWINCH);
758#endif 832#endif
759} 833}
760 834
… …
789 delete fontset[0]; 863 delete fontset[0];
790 fontset[0] = fs; 864 fontset[0] = fs;
791 865
792 prop = (*fs)[1]->properties (); 866 prop = (*fs)[1]->properties ();
793 prop.height += lineSpace; 867 prop.height += lineSpace;
868
794 fs->set_prop (prop); 869 fs->set_prop (prop, false);
795 870
796 fwidth = prop.width; 871 fwidth = prop.width;
797 fheight = prop.height; 872 fheight = prop.height;
798 fbase = prop.ascent; 873 fbase = prop.ascent;
799 874
… …
808 { 883 {
809 fontset[style] = fs = new rxvt_fontset (this); 884 fontset[style] = fs = new rxvt_fontset (this);
810 rxvt_fontprop prop2 = prop; 885 rxvt_fontprop prop2 = prop;
811 886
812 if (res) 887 if (res)
813 prop2.weight = prop2.slant = rxvt_fontprop::unset; 888 {
889 fs->populate (res);
890 fs->set_prop (prop2, false);
891 }
814 else 892 else
815 { 893 {
816 res = fontset[0]->fontdesc; 894 fs->populate (fontset[0]->fontdesc);
817 895
818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 896 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 897 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
898
899 fs->set_prop (prop2, true);
820 } 900 }
821 901
822 fs->populate (res);
823 fs->set_prop (prop2);
824 } 902 }
825#else 903#else
826 fontset[style] = fontset[0]; 904 fontset[style] = fontset[0];
827#endif 905#endif
828 } 906 }
… …
830 if (parent[0]) 908 if (parent[0])
831 { 909 {
832 resize_all_windows (0, 0, 0); 910 resize_all_windows (0, 0, 0);
833 scr_remap_chars (); 911 scr_remap_chars ();
834 scr_touch (true); 912 scr_touch (true);
835 } 913 }
836 914
837 return true; 915 return true;
838} 916}
839 917
918void
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 919rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 920{
842 XChangeProperty (display->display, parent[0], 921 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 922 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 923 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 924}
846 925
926void
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 927rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 928{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 929 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 930 char *s = rxvt_wcstoutf8 (ws);
851 931
852 XChangeProperty (display->display, parent[0], 932 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 933 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 934 (const unsigned char *)s, strlen (s));
855 935
856 free (s); 936 free (s);
857 free (ws); 937 free (ws);
… …
876#if ENABLE_EWMH 956#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
878#endif 958#endif
879} 959}
880 960
961void
962rxvt_term::set_window_color (int idx, const char *color)
963{
881#ifdef XTERM_COLOR_CHANGE 964#ifdef XTERM_COLOR_CHANGE
882void
883rxvt_term::set_window_color (int idx, const char *color)
884{
885 rxvt_color xcol; 965 rxvt_color xcol;
886 int i; 966 int i;
887 967
888 if (color == NULL || *color == '\0') 968 if (color == NULL || *color == '\0')
889 return; 969 return;
890 970
971 color = strdup (color);
972 allocated.push_back ((void *)color);
973 rs[Rs_color + idx] = color;
974
891 /* handle color aliases */ 975 /* handle color aliases */
892 if (isdigit (*color)) 976 if (isdigit (*color))
893 { 977 {
894 i = atoi (color); 978 i = atoi (color);
895 979
896 if (i >= 8 && i <= 15) 980 if (i >= 8 && i <= 15)
981 {
897 { /* bright colors */ 982 /* bright colors */
898 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
900 SET_PIXCOLOR (idx);
901 goto done; 984 goto done;
902 } 985 }
903 986
904 if (i >= 0 && i <= 7) 987 if (i >= 0 && i <= 7)
988 {
905 { /* normal colors */ 989 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 990 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 991 goto done;
909 } 992 }
910 } 993 }
911 994
912 if (!rXParseAllocColor (&xcol, color)) 995 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 996
917 /* 997 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 998 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 999 * so just keep gobbling up the colormap
920 */ 1000 */
921# if 0
922 for (i = Color_Black; i <= Color_White; i++)
923 if (pix_colors[idx] == pix_colors[i])
924 break;
925 if (i > Color_White)
926 {
927 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
928 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
929 DisplayPlanes (display->display, display->screen));
930 }
931# endif
932 1001
933 pix_colors_focused[idx] = xcol; 1002 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 1003
936 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */
938done: 1004done:
939
940#if OFF_FOCUS_FADING
941 if (rs[Rs_fade])
942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
943#endif
944
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 1005 /*TODO: handle Color_BD, scrollbar background, etc. */
946 1006
1007 update_fade_color (idx);
947 recolour_cursor (); 1008 recolour_cursor ();
948 scr_recolour (); 1009 scr_recolour ();
1010#endif /* XTERM_COLOR_CHANGE */
949} 1011}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */
954 1012
955void 1013void
956rxvt_term::recolour_cursor () 1014rxvt_term::recolour_cursor ()
957{ 1015{
958 XColor xcol[2]; 1016 XColor fg, bg;
959 1017
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1018 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 1019 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 1020 : pix_colors_focused[Color_fg]).get (fg);
1021
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1022 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 1023 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 1024 : pix_colors_focused[Color_bg]).get (bg);
966 1025
967 XQueryColors (display->display, display->cmap, xcol, 2); 1026 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 1027}
970 1028
971/*----------------------------------------------------------------------*/ 1029/*----------------------------------------------------------------------*/
972/* 1030/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 1031 * find if fg/bg matches any of the normal (low-intensity) colors
974 */ 1032 */
975void 1033void
976rxvt_term::set_colorfgbg () 1034rxvt_term::set_colorfgbg ()
977{ 1035{
978 unsigned int i; 1036 unsigned int i;
979 const char *xpmb = "\0"; 1037 const char *xpmb = "";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 1039
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 1040 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 1041 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 1042 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 1043 if (pix_colors[Color_fg] == pix_colors[i])
987 { 1044 {
… …
991 1048
992 for (i = Color_Black; i <= Color_White; i++) 1049 for (i = Color_Black; i <= Color_White; i++)
993 if (pix_colors[Color_bg] == pix_colors[i]) 1050 if (pix_colors[Color_bg] == pix_colors[i])
994 { 1051 {
995 sprintf (bstr, "%d", (i - Color_Black)); 1052 sprintf (bstr, "%d", (i - Color_Black));
996#ifdef XPM_BACKGROUND 1053#ifdef BG_IMAGE_FROM_FILE
997 xpmb = "default;"; 1054 xpmb = "default;";
998#endif 1055#endif
999 break; 1056 break;
1000 } 1057 }
1001 1058
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1059 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 1060}
1004 1061
1005/*----------------------------------------------------------------------*/ 1062/*----------------------------------------------------------------------*/
1006 1063
1007int 1064bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1065rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 1066{
1010 if (!screen_in_out->set (display, colour)) 1067 if (color.set (this, name))
1011 {
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1013 return false;
1014 }
1015
1016 return true; 1068 return true;
1069
1070 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1071 return false;
1072}
1073
1074void
1075rxvt_term::alias_color (int dst, int src)
1076{
1077 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 1078}
1018 1079
1019/* -------------------------------------------------------------------- * 1080/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1081 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1082 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1084rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 1085{
1025 int fix_screen; 1086 int fix_screen;
1026 int old_width = szHint.width; 1087 int old_width = szHint.width;
1027 int old_height = szHint.height; 1088 int old_height = szHint.height;
1028 dDisp;
1029 1089
1030 window_calc (newwidth, newheight); 1090 window_calc (newwidth, newheight);
1091
1092 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1093 XSetWMNormalHints (dpy, parent[0], &szHint);
1032 1094
1033 if (!ignoreparent) 1095 if (!ignoreparent)
1034 { 1096 {
1035#ifdef SMART_RESIZE 1097#ifdef SMART_RESIZE
1036 /* 1098 /*
… …
1040 int x, y, x1, y1; 1102 int x, y, x1, y1;
1041 int dx, dy; 1103 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1104 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1105 Window unused_cr;
1044 1106
1045 XTranslateCoordinates (disp, parent[0], display->root, 1107 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 1108 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1109 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1110 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1111 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 1112 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 1113 * our position for handles and decorations. Counter it
1052 */ 1114 */
… …
1054 { 1116 {
1055 x -= x1; 1117 x -= x1;
1056 y -= y1; 1118 y -= y1;
1057 } 1119 }
1058 1120
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1121 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1122 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1123 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1124 dy = old_height - szHint.height;
1063 1125
1064 /* Check position of the center of the window */ 1126 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1127 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1131 if (y < y1) /* top half */
1070 dy = 0; 1132 dy = 0;
1071 else if (y == y1) /* exact center */ 1133 else if (y == y1) /* exact center */
1072 dy /= 2; 1134 dy /= 2;
1073 1135
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1136 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 1137 szHint.width, szHint.height);
1076#else 1138#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1139 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 1140#endif
1079 } 1141 }
1080 1142
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1143 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1144
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1145 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1146 {
1085 if (scrollBar.state) 1147 if (scrollBar.state)
1086 { 1148 {
1087 XMoveResizeWindow (disp, scrollBar.win, 1149 XMoveResizeWindow (dpy, scrollBar.win,
1088 window_sb_x, 0, 1150 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height); 1151 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar (); 1152 resize_scrollbar ();
1091 } 1153 }
1092 1154
1093 XMoveResizeWindow (disp, vt, 1155 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 1156 window_vt_x, window_vt_y,
1095 width, height); 1157 width, height);
1096 1158
1159#ifdef HAVE_BG_PIXMAP
1160 if (bgPixmap.window_size_sensitive ())
1161 update_background ();
1162#endif
1163
1097 scr_clear (); 1164 scr_clear ();
1098#ifdef XPM_BACKGROUND
1099 resize_pixmap ();
1100#endif
1101 } 1165 }
1102 1166
1103 if (fix_screen || old_height == 0) 1167 if (fix_screen || old_height == 0)
1104 scr_reset (); 1168 scr_reset ();
1105 1169
1106#ifdef XPM_BACKGROUND 1170 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1107 if (pixmap) 1171 //scr_touch (false);
1172
1173#ifdef HAVE_BG_PIXMAP
1174// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1175// if (bgPixmap.pixmap)
1108 scr_touch (false); 1176// scr_touch (false);
1109#endif 1177#endif
1110 1178
1111#ifdef USE_XIM 1179#ifdef USE_XIM
1112 IMSetStatusPosition (); 1180 IMSetPosition ();
1113#endif 1181#endif
1114} 1182}
1115 1183
1116/* 1184/*
1117 * Set the width/height of the vt window in characters. Units are pixels. 1185 * Set the width/height of the vt window in characters. Units are pixels.
… …
1122{ 1190{
1123 XWindowAttributes wattr; 1191 XWindowAttributes wattr;
1124 1192
1125 if (newwidth == 0 || newheight == 0) 1193 if (newwidth == 0 || newheight == 0)
1126 { 1194 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1195 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1196
1129 if (newwidth == 0) 1197 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1198 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1199 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1200 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1214#ifdef USE_XIM
1147 1215
1148void 1216void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1217rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1218{
1151 fg = pix_colors[Color_fg]; 1219 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1220 bg = pix_colors [Color_bg];
1153} 1221}
1154 1222
1155void 1223void
1156rxvt_term::im_set_size (XRectangle &size) 1224rxvt_term::im_set_size (XRectangle &size)
1157{ 1225{
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1263
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1265 *p = '\0';
1198 1266
1199 atom = XInternAtom (display->display, server, False); 1267 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1268 win = XGetSelectionOwner (dpy, atom);
1201 1269
1202 if (win != None) 1270 if (win != None)
1203 return True; 1271 return True;
1204 } 1272 }
1205 1273
… …
1212 XPoint nspot; 1280 XPoint nspot;
1213 XVaNestedList preedit_attr; 1281 XVaNestedList preedit_attr;
1214 1282
1215 if (!Input_Context 1283 if (!Input_Context
1216 || !focus 1284 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1285 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1286 return;
1219 1287
1220 im_set_position (nspot); 1288 im_set_position (nspot);
1221 1289
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1290 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1309 input_method = 0;
1242 } 1310 }
1243 1311
1244 Input_Context = 0; 1312 Input_Context = 0;
1245} 1313}
1314
1315#ifdef ENABLE_XIM_ONTHESPOT
1316
1317static void
1318xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1322}
1323
1324static void
1325xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1326{
1327 ((rxvt_term *)client_data)->make_current ();
1328 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1329}
1330
1331static void
1332xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1333{
1334 rxvt_term *term = (rxvt_term *)client_data;
1335 XIMText *text = call_data->text;
1336
1337 term->make_current ();
1338
1339 if (text)
1340 {
1341 void *str;
1342
1343 if (!text->encoding_is_wchar && text->string.multi_byte)
1344 {
1345 // of course, X makes it ugly again
1346 if (term->rs[Rs_imLocale])
1347 SET_LOCALE (term->rs[Rs_imLocale]);
1348
1349 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1350 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1351
1352 if (term->rs[Rs_imLocale])
1353 SET_LOCALE (term->locale);
1354 }
1355 else
1356 str = (void *)text->string.wide_char;
1357
1358 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1359 DT_INT, call_data->caret,
1360 DT_INT, call_data->chg_first,
1361 DT_INT, call_data->chg_length,
1362 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1363 DT_WCS_LEN, str, str ? (int)text->length : 0,
1364 DT_END));
1365 }
1366 else
1367 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1368 DT_INT, call_data->caret,
1369 DT_INT, call_data->chg_first,
1370 DT_INT, call_data->chg_length,
1371 DT_END));
1372}
1373
1374#if 0
1375static void
1376xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1377{
1378 ((rxvt_term *)client_data)->make_current ();
1379 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1380 DT_INT, call_data->position,
1381 DT_INT, call_data->direction,
1382 DT_INT, call_data->style,
1383 DT_END));
1384}
1385#endif
1386
1387#endif
1246 1388
1247/* 1389/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1390 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1391 * open a suitable preedit type
1250 */ 1392 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1399 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1400 unsigned long fg, bg;
1259 const char *p; 1401 const char *p;
1260 char **s; 1402 char **s;
1261 XIMStyles *xim_styles; 1403 XIMStyles *xim_styles;
1404#ifdef ENABLE_XIM_ONTHESPOT
1405 XIMCallback xcb[4];
1406#endif
1262 1407
1263 set_environ (envv); 1408 set_environ (envv);
1264 1409
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1410 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1411 return false;
… …
1292 s = rxvt_splitcommastring (p); 1437 s = rxvt_splitcommastring (p);
1293 1438
1294 for (i = found = 0; !found && s[i]; i++) 1439 for (i = found = 0; !found && s[i]; i++)
1295 { 1440 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1441 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1442 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1443 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1444 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1445 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1446 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1447 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1448 input_style = XIMPreeditNone | XIMStatusNone;
1449#ifdef ENABLE_XIM_ONTHESPOT
1450 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1451 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1452#endif
1453 else
1454 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1455
1305 for (j = 0; j < xim_styles->count_styles; j++) 1456 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1457 if (input_style == xim_styles->supported_styles[j])
1307 { 1458 {
1308 rxvt_freecommastring (s); 1459 rxvt_freecommastring (s);
… …
1346 "*", 1497 "*",
1347 fheight, 1498 fheight,
1348 fheight + 1, fheight - 1, 1499 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1500 fheight - 2, fheight + 2);
1350 1501
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1502 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1503 &missing_charset_list, &missing_charset_count, &def_string);
1353 1504
1354 if (missing_charset_list) 1505 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1506 XFreeStringList (missing_charset_list);
1356 1507
… …
1397 XNBackground, bg, 1548 XNBackground, bg,
1398 XNArea, &status_rect, 1549 XNArea, &status_rect,
1399 XNFontSet, fs, 1550 XNFontSet, fs,
1400 NULL); 1551 NULL);
1401 } 1552 }
1553#if ENABLE_XIM_ONTHESPOT
1554 else if (input_style & XIMPreeditCallbacks)
1555 {
1556 im_set_position (spot);
1557
1558 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1559 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1560 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1561# if 0
1562 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1563# endif
1564
1565 preedit_attr = XVaCreateNestedList (0,
1566 XNSpotLocation, &spot,
1567 XNPreeditStartCallback, &xcb[0],
1568 XNPreeditDoneCallback , &xcb[1],
1569 XNPreeditDrawCallback , &xcb[2],
1570# if 0
1571 XNPreeditCaretCallback, &xcb[3],
1572# endif
1573 NULL);
1574 }
1575#endif
1402 1576
1403 Input_Context = XCreateIC (xim, 1577 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1578 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1579 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1580 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1582 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1583 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1584 status_attr, NULL);
1411 1585
1412 if (preedit_attr) XFree (preedit_attr); 1586 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1587 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1588 if (fs) XFreeFontSet (dpy, fs);
1415 1589
1416 if (Input_Context == NULL) 1590 if (Input_Context == NULL)
1417 { 1591 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1592 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1593 im_destroy ();
1420 return false; 1594 return false;
1421 } 1595 }
1422 1596
1597#if 0
1598 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1599 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1600 vt_select_input ();
1601#endif
1425 1602
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1603 IMSetPosition ();
1428 1604
1429 return true; 1605 return true;
1430} 1606}
1431 1607
1432void 1608void
… …
1490 SET_LOCALE (locale); 1666 SET_LOCALE (locale);
1491#endif 1667#endif
1492} 1668}
1493 1669
1494void 1670void
1495rxvt_term::IMSetStatusPosition () 1671rxvt_term::IMSetPosition ()
1496{ 1672{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1673 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1674 XVaNestedList preedit_attr, status_attr;
1499 1675
1500 if (!Input_Context 1676 if (!Input_Context
1501 || !focus 1677 || !focus
1502 || !(input_style & XIMPreeditArea) 1678 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1679 || !IMisRunning ())
1504 return; 1680 return;
1505 1681
1682 if (input_style & XIMPreeditPosition)
1683 {
1684 im_set_size (preedit_rect);
1685 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1686
1687 XSetICValues (Input_Context,
1688 XNPreeditAttributes, preedit_attr, NULL);
1689 }
1690 else
1691 {
1506 /* Getting the necessary width of preedit area */ 1692 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1693 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1694 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1695 XFree (status_attr);
1510 1696
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1697 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1698 XFree (needed_rect);
1513 1699
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1700 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1701 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1702
1517 XSetICValues (Input_Context, 1703 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1704 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1705 XNStatusAttributes, status_attr,
1706 NULL);
1520 1707
1708 XFree (status_attr);
1709 }
1710
1521 XFree (preedit_attr); 1711 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1712}
1524#endif /* USE_XIM */ 1713#endif /* USE_XIM */
1714
1715void
1716rxvt_term::get_window_origin (int &x, int &y)
1717{
1718 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1721}
1722
1723Pixmap
1724rxvt_term::get_pixmap_property (int prop_id)
1725{
1726 if (prop_id > 0 && prop_id < NUM_XA)
1727 if (xa[prop_id])
1728 {
1729 int aformat;
1730 unsigned long nitems, bytes_after;
1731 Atom atype;
1732 unsigned char *prop = NULL;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP)
1737 {
1738 return *(Pixmap *)prop;
1739 }
1740 }
1741 return None;
1742}
1743
1744#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS
1746# undef update_background
1747int rxvt_term::trace_update_background (const char *file, int line)
1748{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background ();
1751}
1752# endif
1753
1754int
1755rxvt_term::update_background ()
1756{
1757 bgPixmap.invalidate ();
1758
1759 /* no chance of real time refresh if we are blurring! */
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1761 bgPixmap.render ();
1762 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775}
1776
1777void
1778rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{
1780 bgPixmap.render ();
1781}
1782
1783#endif /* HAVE_BG_PIXMAP */
1525 1784
1526/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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