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

Diff Legend

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