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.195 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.264 by root, Sat Nov 24 11:06:13 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 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
55 60
56static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
57 62
58bool 63bool
59rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) NOTHROW
60{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
61 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 72 return false;
63 73
64 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
66 return true; 76 return true;
67} 77}
68 78
69void 79void
… …
83class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
84 94
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 96{
87 compose_char *cc; 97 compose_char *cc;
88 98
89 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 101 cc = (*this)[c1];
92 while (cc) 102 while (cc)
93 { 103 {
… …
143} 153}
144#endif 154#endif
145 155
146rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
147 : 157 :
148#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 163#endif
151#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 166#endif
154#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 184#endif
172#ifdef USE_XIM 185#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
174#endif 187#endif
175#ifndef NO_BELL 188#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
177#endif 190#endif
178 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
179 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
181 check_ev (this, &rxvt_term::check_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
182 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
183 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
184 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
185 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
186{ 199{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 201
189 termlist.push_back (this); 202 termlist.push_back (this);
190 203
… …
193#endif 206#endif
194} 207}
195 208
196// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 210// for use before an emergency exit
211void
198void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
199{ 213{
200 if (cmd_pid) 214 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
202 216
217 pty_ev.stop ();
203 delete pty; pty = 0; 218 delete pty; pty = 0;
204} 219}
205 220
206rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
207{ 222{
… …
216#endif 231#endif
217 delete fontset[0]; 232 delete fontset[0];
218 233
219 if (display) 234 if (display)
220 { 235 {
221 dDisp;
222
223 selection_clear (); 236 selection_clear ();
224 237
225#ifdef USE_XIM 238#ifdef USE_XIM
226 im_destroy (); 239 im_destroy ();
227#endif 240#endif
228#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 244#endif
232#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 247#endif
235#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 259#endif
247#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 264#endif
252 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
253 266
254 delete drawable; 267 delete drawable;
255 // destroy all windows 268 // destroy all windows
256 if (parent[0]) 269 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
258 }
259 271
260 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
280
281 clear ();
282 }
283
284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
264#endif 287#endif
265 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
266 displays.put (display); 292 displays.put (display);
267 293
268 scr_release (); 294 scr_release ();
269 295
270 /* clear all resources */ 296 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 297 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 298 free (allocated [i]);
273 299
274 free (selection.text); 300 free (selection.text);
275 // TODO: manage env vars in child only(!) 301 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 302 free (env_display);
278 free (env_term); 303 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 304 free (locale);
281 free (v_buffer); 305 free (v_buffer);
282 free (incr_buf); 306 free (incr_buf);
283 307
284 delete envv; 308 delete envv;
285 delete argv; 309 delete argv;
286 310
287#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
288 delete keyboard; 312 delete keyboard;
289#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
290} 317}
291 318
292// child has exited, usually destroys 319// child has exited, usually destroys
293void 320void
294rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
295{ 322{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 324
298 cmd_pid = 0; 325 cmd_pid = 0;
299 326
300 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
301 destroy (); 328 destroy ();
302} 329}
303 330
304void 331void
305rxvt_term::destroy () 332rxvt_term::destroy ()
306{ 333{
307 if (destroy_ev.active) 334 if (destroy_ev.active)
308 return; 335 return;
309 336
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 338
313#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
314 scr_overlay_off (); 340 scr_overlay_off ();
315#endif 341#endif
316 342
… …
320 im_ev.stop (display); 346 im_ev.stop (display);
321#endif 347#endif
322#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
324#endif 350#endif
325#if TRANSPARENT 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
327#endif 353#endif
328 incr_ev.stop (); 354 incr_ev.stop ();
329 termwin_ev.stop (display); 355 termwin_ev.stop (display);
330 vt_ev.stop (display); 356 vt_ev.stop (display);
331 } 357 }
332 358
333 check_ev.stop (); 359 prepare_ev.stop ();
334 pty_ev.stop (); 360 pty_ev.stop ();
335#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
337#endif 363#endif
338#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
346#endif 372#endif
347#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
348 pointer_ev.stop (); 374 pointer_ev.stop ();
349#endif 375#endif
350 376
351 destroy_ev.start (0); 377 destroy_ev.start ();
352} 378}
353 379
354void 380void
355rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 382{
357 make_current (); 383 make_current ();
358 384
359 delete this; 385 delete this;
360} 386}
… …
371{ 397{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 399 (*t)->emergency_cleanup ();
374} 400}
375 401
376#if ENABLE_FRILLS 402#if !ENABLE_MINIMAL
377static void 403static void
378print_x_error (Display *dpy, XErrorEvent *event) 404print_x_error (Display *dpy, XErrorEvent *event)
379{ 405{
380 char buffer[BUFSIZ]; 406 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 407 char mesg[BUFSIZ];
… …
414 else 440 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 442 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 444 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 446 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 448}
423#endif 449#endif
424 450
… …
429 GET_R->allowedxerror = event->error_code; 455 GET_R->allowedxerror = event->error_code;
430 else 456 else
431 { 457 {
432 // GET_R is most likely not the terminal which caused the error, 458 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 459 // so just output the error and continue
434#if ENABLE_FRILLS 460#if ENABLE_MINIMAL
461 old_xerror_handler (display, event);
462#else
435 print_x_error (display, event); 463 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 464#endif
439 } 465 }
440 466
441 return 0; 467 return 0;
442} 468}
… …
470#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 497 keyboard->register_done ();
472#endif 498#endif
473 499
474#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 503#endif
478 504
479 pty = ptytty_new (); 505 pty = ptytty::create ();
480 506
481 create_windows (argc, argv); 507 create_windows (argc, argv);
482 508
483 dDisp;
484
485 init_xlocale (); 509 init_xlocale ();
486 510
487 scr_reset (); // initialize screen 511 scr_reset (); // initialize screen
488 512
489#if 0 513#if 0
490 XSynchronize (disp, True); 514 XSynchronize (dpy, True);
491#endif 515#endif
492 516
493#ifdef HAVE_SCROLLBARS 517#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 518 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 519 resize_scrollbar (); /* create and map scrollbar */
496#endif 520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
497#ifdef TRANSPARENT 525#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 526 if (option (Opt_transparent))
499 { 527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
503 } 541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
504#endif 567#endif
505 568
506 set_colorfgbg (); 569 set_colorfgbg ();
507 570
508 init_command (cmd_argv); 571 init_command (cmd_argv);
509 572
510 free (cmd_argv); 573 free (cmd_argv);
511 574
512 if (pty->pty >= 0) 575 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
514 577
515 check_ev.start (); 578 prepare_ev.start ();
516 579
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
519 XMapWindow (disp, vt); 592 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 593 XMapWindow (dpy, parent[0]);
521 594
522 return true; 595 return true;
523} 596}
524 597
525static struct sig_handlers 598static struct sig_handlers
526{ 599{
527 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
528 601
529 /* 602 /*
530 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
531 */ 604 */
532 void 605 void
533 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
534 { 607 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 609 w.stop ();
540 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
541 } 611 }
542 612
543 sig_handlers () 613 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
550char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
551 621
552void 622void
553rxvt_init () 623rxvt_init ()
554{ 624{
555 uid_t uid = getuid (); 625 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568 626
569 // drop privileges 627 if (!ev_default_loop (0))
570#if HAVE_SETRESUID 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 629
586 rxvt_environ = environ; 630 rxvt_environ = environ;
587 631
588 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
590 634
591 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
592 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
593 637
594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
595 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
596 640
597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
637 return p; 681 return p;
638} 682}
639 683
640/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
641/* 685/*
642 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
643 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
644 */ 688 */
645void 689void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 691{
648 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 693 int x, y, sb_w, flags;
650 unsigned int w, h; 694 unsigned int w, h;
651 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 696
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 700
… …
722 762
723 if (scrollBar.state) 763 if (scrollBar.state)
724 { 764 {
725 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
726 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
727 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 769 window_vt_x += sb_w;
729 } 770 }
730 771
731 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
735 776
736 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 778 {
738 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
753 { 794 {
754 min_it (height, max_height); 795 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
756 } 797 }
757 798
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
760 801
761 if (recalc_x) 802 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
763 if (recalc_y) 805 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 807
766 ncol = width / fwidth; 808 ncol = width / fwidth;
767 nrow = height / fheight; 809 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 810}
773 811
774/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
775/* 813/*
776 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
… …
828 delete fontset[0]; 866 delete fontset[0];
829 fontset[0] = fs; 867 fontset[0] = fs;
830 868
831 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
832 prop.height += lineSpace; 870 prop.height += lineSpace;
871
833 fs->set_prop (prop); 872 fs->set_prop (prop, false);
834 873
835 fwidth = prop.width; 874 fwidth = prop.width;
836 fheight = prop.height; 875 fheight = prop.height;
837 fbase = prop.ascent; 876 fbase = prop.ascent;
838 877
… …
847 { 886 {
848 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
849 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
850 889
851 if (res) 890 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
853 else 895 else
854 { 896 {
855 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
856 898
857 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;
858 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);
859 } 903 }
860 904
861 fs->populate (res);
862 fs->set_prop (prop2);
863 } 905 }
864#else 906#else
865 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
866#endif 908#endif
867 } 909 }
… …
869 if (parent[0]) 911 if (parent[0])
870 { 912 {
871 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 914 scr_remap_chars ();
873 scr_touch (true); 915 scr_touch (true);
874 } 916 }
875 917
876 return true; 918 return true;
877} 919}
878 920
921void
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 923{
881 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 927}
885 928
929void
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 931{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
890 934
891 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
894 938
895 free (s); 939 free (s);
896 free (ws); 940 free (ws);
… …
915#if ENABLE_EWMH 959#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 961#endif
918} 962}
919 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
920#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
921void
922rxvt_term::set_window_color (int idx, const char *color)
923{
924 rxvt_color xcol; 968 rxvt_color xcol;
925 int i; 969 int i;
926 970
927 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
928 return; 972 return;
973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
929 977
930 /* handle color aliases */ 978 /* handle color aliases */
931 if (isdigit (*color)) 979 if (isdigit (*color))
932 { 980 {
933 i = atoi (color); 981 i = atoi (color);
934 982
935 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
936 { /* bright colors */ 984 { /* bright colors */
937 i -= 8; 985 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
939 SET_PIXCOLOR (idx);
940 goto done; 987 goto done;
941 } 988 }
942 989
943 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
944 { /* normal colors */ 991 { /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 993 goto done;
948 } 994 }
949 } 995 }
950 996
951 if (!rXParseAllocColor (&xcol, color)) 997 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 998
956 /* 999 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 1000 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 1001 * so just keep gobbling up the colormap
959 */ 1002 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 1003
972 pix_colors_focused[idx] = xcol; 1004 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 1005
975 /* XSetWindowAttributes attr; */ 1006 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */ 1007 /* Cursor cursor; */
977done: 1008done:
978
979#if OFF_FOCUS_FADING
980 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
982#endif
983
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
985 1010
1011 update_fade_color (idx);
986 recolour_cursor (); 1012 recolour_cursor ();
987 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
988} 1015}
989
990#else
991# define set_window_color (idx,color) ((void)0)
992#endif /* XTERM_COLOR_CHANGE */
993 1016
994void 1017void
995rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
996{ 1019{
997 XColor xcol[2]; 1020 XColor fg, bg;
998 1021
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1022 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 1023 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 1024 : pix_colors_focused[Color_fg]).get (fg);
1025
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1026 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 1027 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 1028 : pix_colors_focused[Color_bg]).get (bg);
1005 1029
1006 XQueryColors (display->display, display->cmap, xcol, 2); 1030 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 1031}
1009 1032
1010/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1011/* 1034/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 1035 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1016{ 1039{
1017 unsigned int i; 1040 unsigned int i;
1018 const char *xpmb = "\0"; 1041 const char *xpmb = "\0";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 1043
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 1047 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 1048 {
… …
1030 1052
1031 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
1033 { 1055 {
1034 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1035#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1036 xpmb = "default;"; 1058 xpmb = "default;";
1037#endif 1059#endif
1038 break; 1060 break;
1039 } 1061 }
1040 1062
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 1064}
1043 1065
1044/*----------------------------------------------------------------------*/ 1066/*----------------------------------------------------------------------*/
1045 1067
1046int 1068bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1069rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 1070{
1049 if (!screen_in_out->set (display, colour)) 1071 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 return true; 1072 return true;
1073
1074 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1075 return false;
1076}
1077
1078void
1079rxvt_term::alias_color (int dst, int src)
1080{
1081 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 1082}
1057 1083
1058/* -------------------------------------------------------------------- * 1084/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1085 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1086 * -------------------------------------------------------------------- */
1061void 1087void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1088rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1089{
1064 int fix_screen; 1090 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1091 int old_width = szHint.width;
1066 dDisp; 1092 int old_height = szHint.height;
1067 1093
1068 window_calc (newwidth, newheight); 1094 window_calc (newwidth, newheight);
1095
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1097 XSetWMNormalHints (dpy, parent[0], &szHint);
1070 1098
1071 if (!ignoreparent) 1099 if (!ignoreparent)
1072 { 1100 {
1073#ifdef SMART_RESIZE 1101#ifdef SMART_RESIZE
1074 /* 1102 /*
… …
1078 int x, y, x1, y1; 1106 int x, y, x1, y1;
1079 int dx, dy; 1107 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1109 Window unused_cr;
1082 1110
1083 XTranslateCoordinates (disp, parent[0], display->root, 1111 XTranslateCoordinates (dpy, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 1112 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1115 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1116 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1117 * our position for handles and decorations. Counter it
1090 */ 1118 */
… …
1092 { 1120 {
1093 x -= x1; 1121 x -= x1;
1094 y -= y1; 1122 y -= y1;
1095 } 1123 }
1096 1124
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1125 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1126 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1127 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1128 dy = old_height - szHint.height;
1101 1129
1102 /* Check position of the center of the window */ 1130 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1131 if (x < x1) /* left half */
1104 dx = 0; 1132 dx = 0;
… …
1107 if (y < y1) /* top half */ 1135 if (y < y1) /* top half */
1108 dy = 0; 1136 dy = 0;
1109 else if (y == y1) /* exact center */ 1137 else if (y == y1) /* exact center */
1110 dy /= 2; 1138 dy /= 2;
1111 1139
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 1141 szHint.width, szHint.height);
1114#else 1142#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1116#endif 1144#endif
1117 } 1145 }
1118 1146
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1148
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1150 {
1123 if (scrollBar.state) 1151 if (scrollBar.state)
1124 { 1152 {
1125 XMoveResizeWindow (disp, scrollBar.win, 1153 XMoveResizeWindow (dpy, scrollBar.win,
1126 window_sb_x, 0, 1154 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 1155 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar (); 1156 resize_scrollbar ();
1129 } 1157 }
1130 1158
1131 XMoveResizeWindow (disp, vt, 1159 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1133 width, height); 1161 width, height);
1134 1162
1163#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ())
1165 update_background ();
1166#endif
1167
1135 scr_clear (); 1168 scr_clear ();
1136#ifdef XPM_BACKGROUND
1137 resize_pixmap ();
1138#endif
1139 } 1169 }
1140 1170
1141 if (fix_screen || old_height == 0) 1171 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1172 scr_reset ();
1156 1173
1157 if (curr_screen >= 0) /* this is not the first time through */ 1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 1175 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163 1176
1164 old_width = szHint.width; 1177#ifdef HAVE_BG_PIXMAP
1165 old_height = szHint.height; 1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1166 1179// if (bgPixmap.pixmap)
1167#ifdef XPM_BACKGROUND
1168 if (pixmap)
1169 scr_touch (false); 1180// scr_touch (false);
1170#endif 1181#endif
1171 1182
1172#ifdef USE_XIM 1183#ifdef USE_XIM
1173 IMSetStatusPosition (); 1184 IMSetPosition ();
1174#endif 1185#endif
1175} 1186}
1176 1187
1177/* 1188/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1189 * Set the width/height of the vt window in characters. Units are pixels.
… …
1183{ 1194{
1184 XWindowAttributes wattr; 1195 XWindowAttributes wattr;
1185 1196
1186 if (newwidth == 0 || newheight == 0) 1197 if (newwidth == 0 || newheight == 0)
1187 { 1198 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1199 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1200
1190 if (newwidth == 0) 1201 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1202 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1203 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1204 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1218#ifdef USE_XIM
1208 1219
1209void 1220void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1221rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1222{
1212 fg = pix_colors[Color_fg]; 1223 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1224 bg = pix_colors [Color_bg];
1214} 1225}
1215 1226
1216void 1227void
1217rxvt_term::im_set_size (XRectangle &size) 1228rxvt_term::im_set_size (XRectangle &size)
1218{ 1229{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1267
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1269 *p = '\0';
1259 1270
1260 atom = XInternAtom (display->display, server, False); 1271 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1272 win = XGetSelectionOwner (dpy, atom);
1262 1273
1263 if (win != None) 1274 if (win != None)
1264 return True; 1275 return True;
1265 } 1276 }
1266 1277
… …
1273 XPoint nspot; 1284 XPoint nspot;
1274 XVaNestedList preedit_attr; 1285 XVaNestedList preedit_attr;
1275 1286
1276 if (!Input_Context 1287 if (!Input_Context
1277 || !focus 1288 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1289 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1290 return;
1280 1291
1281 im_set_position (nspot); 1292 im_set_position (nspot);
1282 1293
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1294 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1313 input_method = 0;
1303 } 1314 }
1304 1315
1305 Input_Context = 0; 1316 Input_Context = 0;
1306} 1317}
1318
1319#ifdef ENABLE_XIM_ONTHESPOT
1320
1321static void
1322xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1323{
1324 ((rxvt_term *)client_data)->make_current ();
1325 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1326}
1327
1328static void
1329xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1330{
1331 ((rxvt_term *)client_data)->make_current ();
1332 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1333}
1334
1335static void
1336xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1337{
1338 rxvt_term *term = (rxvt_term *)client_data;
1339 XIMText *text = call_data->text;
1340
1341 term->make_current ();
1342
1343 if (text)
1344 {
1345 void *str;
1346
1347 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 {
1349 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]);
1352
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1355
1356 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale);
1358 }
1359 else
1360 str = (void *)text->string.wide_char;
1361
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1367 DT_WCS_LEN, str, str ? (int)text->length : 0,
1368 DT_END));
1369 }
1370 else
1371 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1372 DT_INT, call_data->caret,
1373 DT_INT, call_data->chg_first,
1374 DT_INT, call_data->chg_length,
1375 DT_END));
1376}
1377
1378#if 0
1379static void
1380xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1381{
1382 ((rxvt_term *)client_data)->make_current ();
1383 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1384 DT_INT, call_data->position,
1385 DT_INT, call_data->direction,
1386 DT_INT, call_data->style,
1387 DT_END));
1388}
1389#endif
1390
1391#endif
1307 1392
1308/* 1393/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1394 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1395 * open a suitable preedit type
1311 */ 1396 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1403 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1404 unsigned long fg, bg;
1320 const char *p; 1405 const char *p;
1321 char **s; 1406 char **s;
1322 XIMStyles *xim_styles; 1407 XIMStyles *xim_styles;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 XIMCallback xcb[4];
1410#endif
1323 1411
1324 set_environ (envv); 1412 set_environ (envv);
1325 1413
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1414 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1415 return false;
1328 1416
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1417 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1418 if (input_method == NULL)
1332 return false; 1419 return false;
1333 1420
1334 xim = input_method->xim; 1421 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1441 s = rxvt_splitcommastring (p);
1355 1442
1356 for (i = found = 0; !found && s[i]; i++) 1443 for (i = found = 0; !found && s[i]; i++)
1357 { 1444 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1445 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1446 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1447 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1448 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1449 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1450 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1451 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1452 input_style = XIMPreeditNone | XIMStatusNone;
1453#ifdef ENABLE_XIM_ONTHESPOT
1454 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1455 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1456#endif
1457 else
1458 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1459
1367 for (j = 0; j < xim_styles->count_styles; j++) 1460 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1461 if (input_style == xim_styles->supported_styles[j])
1369 { 1462 {
1370 rxvt_freecommastring (s); 1463 rxvt_freecommastring (s);
… …
1408 "*", 1501 "*",
1409 fheight, 1502 fheight,
1410 fheight + 1, fheight - 1, 1503 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1504 fheight - 2, fheight + 2);
1412 1505
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1506 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1507 &missing_charset_list, &missing_charset_count, &def_string);
1415 1508
1416 if (missing_charset_list) 1509 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1510 XFreeStringList (missing_charset_list);
1418 1511
… …
1459 XNBackground, bg, 1552 XNBackground, bg,
1460 XNArea, &status_rect, 1553 XNArea, &status_rect,
1461 XNFontSet, fs, 1554 XNFontSet, fs,
1462 NULL); 1555 NULL);
1463 } 1556 }
1557#if ENABLE_XIM_ONTHESPOT
1558 else if (input_style & XIMPreeditCallbacks)
1559 {
1560 im_set_position (spot);
1561
1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1563 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1564 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1565# if 0
1566 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1567# endif
1568
1569 preedit_attr = XVaCreateNestedList (0,
1570 XNSpotLocation, &spot,
1571 XNPreeditStartCallback, &xcb[0],
1572 XNPreeditDoneCallback , &xcb[1],
1573 XNPreeditDrawCallback , &xcb[2],
1574# if 0
1575 XNPreeditCaretCallback, &xcb[3],
1576# endif
1577 NULL);
1578 }
1579#endif
1464 1580
1465 Input_Context = XCreateIC (xim, 1581 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1582 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1583 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1584 XNFocusWindow, parent[0],
… …
1470 preedit_attr, 1586 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1587 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1588 status_attr, NULL);
1473 1589
1474 if (preedit_attr) XFree (preedit_attr); 1590 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1591 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1592 if (fs) XFreeFontSet (dpy, fs);
1477 1593
1478 if (Input_Context == NULL) 1594 if (Input_Context == NULL)
1479 { 1595 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1596 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1597 im_destroy ();
1482 return false; 1598 return false;
1483 } 1599 }
1484 1600
1485 if (input_style & XIMPreeditArea) 1601#if 0
1602 // unfortunately, only the focus window is used by XIM, hard to fix
1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1604 vt_select_input ();
1605#endif
1606
1486 IMSetStatusPosition (); 1607 IMSetPosition ();
1487 1608
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1609 return true;
1490} 1610}
1491 1611
1492void 1612void
1493rxvt_term::im_cb () 1613rxvt_term::im_cb ()
… …
1499 1619
1500 make_current (); 1620 make_current ();
1501 1621
1502 im_destroy (); 1622 im_destroy ();
1503 1623
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1624 if (Input_Context)
1506 return; 1625 return;
1507 1626
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
… …
1551 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1552#endif 1671#endif
1553} 1672}
1554 1673
1555void 1674void
1556rxvt_term::IMSetStatusPosition () 1675rxvt_term::IMSetPosition ()
1557{ 1676{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1677 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1678 XVaNestedList preedit_attr, status_attr;
1560 1679
1561 if (!Input_Context 1680 if (!Input_Context
1562 || !focus 1681 || !focus
1563 || !(input_style & XIMPreeditArea) 1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1683 || !IMisRunning ())
1565 return; 1684 return;
1566 1685
1686 if (input_style & XIMPreeditPosition)
1687 {
1688 im_set_size (preedit_rect);
1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1690
1691 XSetICValues (Input_Context,
1692 XNPreeditAttributes, preedit_attr, NULL);
1693 }
1694 else
1695 {
1567 /* Getting the necessary width of preedit area */ 1696 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1698 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1699 XFree (status_attr);
1571 1700
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1701 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1702 XFree (needed_rect);
1574 1703
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1704 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1705 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1706
1578 XSetICValues (Input_Context, 1707 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1708 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1709 XNStatusAttributes, status_attr,
1710 NULL);
1581 1711
1712 XFree (status_attr);
1713 }
1714
1582 XFree (preedit_attr); 1715 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1716}
1585#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1718
1719void
1720rxvt_term::get_window_origin (int &x, int &y)
1721{
1722 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746}
1747
1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
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 */
1586 1787
1587/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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