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.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.261 by root, Mon Nov 19 15:33:34 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 bgPixmap.destroy ();
266 displays.put (display); 290 displays.put (display);
267 291
268 scr_release (); 292 scr_release ();
269 293
270 /* clear all resources */ 294 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 295 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 296 free (allocated [i]);
273 297
274 free (selection.text); 298 free (selection.text);
275 // TODO: manage env vars in child only(!) 299 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 300 free (env_display);
278 free (env_term); 301 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 302 free (locale);
281 free (v_buffer); 303 free (v_buffer);
282 free (incr_buf); 304 free (incr_buf);
283 305
284 delete envv; 306 delete envv;
… …
289#endif 311#endif
290} 312}
291 313
292// child has exited, usually destroys 314// child has exited, usually destroys
293void 315void
294rxvt_term::child_cb (child_watcher &w, int status) 316rxvt_term::child_cb (ev::child &w, int status)
295{ 317{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 318 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 319
298 cmd_pid = 0; 320 cmd_pid = 0;
299 321
300 if (!OPTION (Opt_hold)) 322 if (!option (Opt_hold))
301 destroy (); 323 destroy ();
302} 324}
303 325
304void 326void
305rxvt_term::destroy () 327rxvt_term::destroy ()
… …
319 im_ev.stop (display); 341 im_ev.stop (display);
320#endif 342#endif
321#if HAVE_SCROLLBARS 343#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 344 scrollbar_ev.stop (display);
323#endif 345#endif
324#if TRANSPARENT 346#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 347 rootwin_ev.stop (display);
326#endif 348#endif
327 incr_ev.stop (); 349 incr_ev.stop ();
328 termwin_ev.stop (display); 350 termwin_ev.stop (display);
329 vt_ev.stop (display); 351 vt_ev.stop (display);
330 } 352 }
331 353
332 check_ev.stop (); 354 prepare_ev.stop ();
333 pty_ev.stop (); 355 pty_ev.stop ();
334#ifdef CURSOR_BLINK 356#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 357 cursor_blink_ev.stop ();
336#endif 358#endif
337#ifdef TEXT_BLINK 359#ifdef TEXT_BLINK
… …
345#endif 367#endif
346#ifdef POINTER_BLANK 368#ifdef POINTER_BLANK
347 pointer_ev.stop (); 369 pointer_ev.stop ();
348#endif 370#endif
349 371
350 destroy_ev.start (0); 372 destroy_ev.start ();
351} 373}
352 374
353void 375void
354rxvt_term::destroy_cb (time_watcher &w) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 377{
356 make_current (); 378 make_current ();
357 379
358 delete this; 380 delete this;
359} 381}
… …
370{ 392{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 393 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 394 (*t)->emergency_cleanup ();
373} 395}
374 396
375#if ENABLE_FRILLS 397#if !ENABLE_MINIMAL
376static void 398static void
377print_x_error (Display *dpy, XErrorEvent *event) 399print_x_error (Display *dpy, XErrorEvent *event)
378{ 400{
379 char buffer[BUFSIZ]; 401 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 402 char mesg[BUFSIZ];
… …
413 else 435 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 437 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 439 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 441 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 443}
422#endif 444#endif
423 445
… …
428 GET_R->allowedxerror = event->error_code; 450 GET_R->allowedxerror = event->error_code;
429 else 451 else
430 { 452 {
431 // GET_R is most likely not the terminal which caused the error, 453 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 454 // so just output the error and continue
433#if ENABLE_FRILLS 455#if ENABLE_MINIMAL
456 old_xerror_handler (display, event);
457#else
434 print_x_error (display, event); 458 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 459#endif
438 } 460 }
439 461
440 return 0; 462 return 0;
441} 463}
… …
469#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
470 keyboard->register_done (); 492 keyboard->register_done ();
471#endif 493#endif
472 494
473#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 496 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 497 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 498#endif
477 499
478 pty = ptytty::create (); 500 pty = ptytty::create ();
479 501
480 create_windows (argc, argv); 502 create_windows (argc, argv);
481 503
482 dDisp;
483
484 init_xlocale (); 504 init_xlocale ();
485 505
486 scr_reset (); // initialize screen 506 scr_reset (); // initialize screen
487 507
488#if 0 508#if 0
489 XSynchronize (disp, True); 509 XSynchronize (dpy, True);
490#endif 510#endif
491 511
492#ifdef HAVE_SCROLLBARS 512#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 513 if (option (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 514 resize_scrollbar (); /* create and map scrollbar */
495#endif 515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
496#ifdef TRANSPARENT 520#ifdef ENABLE_TRANSPARENCY
497 if (OPTION (Opt_transparent)) 521 if (option (Opt_transparent))
498 { 522 {
523 bgPixmap.set_transparent ();
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
499 XSelectInput (disp, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
502 } 536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap] != NULL)
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != NULL)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
503#endif 562#endif
504 563
505 set_colorfgbg (); 564 set_colorfgbg ();
506 565
507 init_command (cmd_argv); 566 init_command (cmd_argv);
508 567
509 free (cmd_argv); 568 free (cmd_argv);
510 569
511 if (pty->pty >= 0) 570 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
513 572
514 check_ev.start (); 573 prepare_ev.start ();
515 574
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
518 XMapWindow (disp, vt); 587 XMapWindow (dpy, vt);
519 XMapWindow (disp, parent[0]); 588 XMapWindow (dpy, parent[0]);
520 589
521 return true; 590 return true;
522} 591}
523 592
524static struct sig_handlers 593static struct sig_handlers
525{ 594{
526 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
527 596
528 /* 597 /*
529 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
530 */ 599 */
531 void 600 void
532 sig_term (sig_watcher &w) 601 sig_term (ev::sig &w, int revents)
533 { 602 {
534 rxvt_emergency_cleanup (); 603 rxvt_emergency_cleanup ();
535 signal (w.signum, SIG_DFL); 604 w.stop ();
536 kill (getpid (), w.signum); 605 kill (getpid (), w.signum);
537 } 606 }
538 607
539 sig_handlers () 608 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term), 609 : sw_term (this, &sig_handlers::sig_term),
… …
548void 617void
549rxvt_init () 618rxvt_init ()
550{ 619{
551 ptytty::init (); 620 ptytty::init ();
552 621
622 if (!ev::ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624
553 rxvt_environ = environ; 625 rxvt_environ = environ;
554 626
555 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
557 629
558 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
559 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
560 632
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
563 635
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
604 return p; 676 return p;
605} 677}
606 678
607/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
608/* 680/*
609 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
610 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
611 */ 683 */
612void 684void
613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
614{ 686{
615 short recalc_x, recalc_y; 687 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 688 int x, y, sb_w, flags;
617 unsigned int w, h; 689 unsigned int w, h;
618 unsigned int max_width, max_height; 690 unsigned int max_width, max_height;
619 dDisp;
620 691
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 693 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 694 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 695
… …
686 757
687 if (scrollBar.state) 758 if (scrollBar.state)
688 { 759 {
689 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
762
691 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
692 window_vt_x += sb_w; 764 window_vt_x += sb_w;
693 } 765 }
694 766
695 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 769 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 770 szHint.min_height = szHint.base_height + szHint.height_inc;
699 771
700 if (newwidth && newwidth - szHint.base_width < max_width) 772 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 773 {
702 szHint.width = newwidth; 774 szHint.width = newwidth;
… …
717 { 789 {
718 min_it (height, max_height); 790 min_it (height, max_height);
719 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
720 } 792 }
721 793
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
724 796
725 if (recalc_x) 797 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799
727 if (recalc_y) 800 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 802
730 ncol = width / fwidth; 803 ncol = width / fwidth;
731 nrow = height / fheight; 804 nrow = height / fheight;
732} 805}
733 806
… …
788 delete fontset[0]; 861 delete fontset[0];
789 fontset[0] = fs; 862 fontset[0] = fs;
790 863
791 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
792 prop.height += lineSpace; 865 prop.height += lineSpace;
866
793 fs->set_prop (prop); 867 fs->set_prop (prop, false);
794 868
795 fwidth = prop.width; 869 fwidth = prop.width;
796 fheight = prop.height; 870 fheight = prop.height;
797 fbase = prop.ascent; 871 fbase = prop.ascent;
798 872
… …
807 { 881 {
808 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
810 884
811 if (res) 885 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
813 else 890 else
814 { 891 {
815 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
816 893
817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 894 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 895 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
896
897 fs->set_prop (prop2, true);
819 } 898 }
820 899
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 900 }
824#else 901#else
825 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
826#endif 903#endif
827 } 904 }
… …
829 if (parent[0]) 906 if (parent[0])
830 { 907 {
831 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
832 scr_remap_chars (); 909 scr_remap_chars ();
833 scr_touch (true); 910 scr_touch (true);
834 } 911 }
835 912
836 return true; 913 return true;
837} 914}
838 915
916void
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 918{
841 XChangeProperty (display->display, parent[0], 919 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 922}
845 923
924void
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 926{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
850 929
851 XChangeProperty (display->display, parent[0], 930 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 932 (const unsigned char *)s, strlen (s));
854 933
855 free (s); 934 free (s);
856 free (ws); 935 free (ws);
… …
875#if ENABLE_EWMH 954#if ENABLE_EWMH
876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
877#endif 956#endif
878} 957}
879 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
880#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
881void
882rxvt_term::set_window_color (int idx, const char *color)
883{
884 rxvt_color xcol; 963 rxvt_color xcol;
885 int i; 964 int i;
886 965
887 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
888 return; 967 return;
968
969 color = strdup (color);
970 allocated.push_back ((void *)color);
971 rs[Rs_color + idx] = color;
889 972
890 /* handle color aliases */ 973 /* handle color aliases */
891 if (isdigit (*color)) 974 if (isdigit (*color))
892 { 975 {
893 i = atoi (color); 976 i = atoi (color);
894 977
895 if (i >= 8 && i <= 15) 978 if (i >= 8 && i <= 15)
896 { /* bright colors */ 979 { /* bright colors */
897 i -= 8; 980 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
899 SET_PIXCOLOR (idx);
900 goto done; 982 goto done;
901 } 983 }
902 984
903 if (i >= 0 && i <= 7) 985 if (i >= 0 && i <= 7)
904 { /* normal colors */ 986 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 988 goto done;
908 } 989 }
909 } 990 }
910 991
911 if (!rXParseAllocColor (&xcol, color)) 992 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 993
916 /* 994 /*
917 * FIXME: should free colors here, but no idea how to do it so instead, 995 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap 996 * so just keep gobbling up the colormap
919 */ 997 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 998
932 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 1000
935 /* XSetWindowAttributes attr; */ 1001 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 1002 /* Cursor cursor; */
937done: 1003done:
938
939#if OFF_FOCUS_FADING
940 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
942#endif
943
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
945 1005
1006 update_fade_color (idx);
946 recolour_cursor (); 1007 recolour_cursor ();
947 scr_recolour (); 1008 scr_recolour ();
1009#endif /* XTERM_COLOR_CHANGE */
948} 1010}
949
950#else
951# define set_window_color (idx,color) ((void)0)
952#endif /* XTERM_COLOR_CHANGE */
953 1011
954void 1012void
955rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
956{ 1014{
957 XColor xcol[2]; 1015 XColor fg, bg;
958 1016
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1017 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 1018 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 1019 : pix_colors_focused[Color_fg]).get (fg);
1020
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1021 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 1022 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 1023 : pix_colors_focused[Color_bg]).get (bg);
965 1024
966 XQueryColors (display->display, display->cmap, xcol, 2); 1025 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 1026}
969 1027
970/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
971/* 1029/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 1030 * find if fg/bg matches any of the normal (low-intensity) colors
… …
976{ 1034{
977 unsigned int i; 1035 unsigned int i;
978 const char *xpmb = "\0"; 1036 const char *xpmb = "\0";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1037 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 1038
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 1039 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 1040 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 1041 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 1042 if (pix_colors[Color_fg] == pix_colors[i])
986 { 1043 {
… …
990 1047
991 for (i = Color_Black; i <= Color_White; i++) 1048 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 1049 if (pix_colors[Color_bg] == pix_colors[i])
993 { 1050 {
994 sprintf (bstr, "%d", (i - Color_Black)); 1051 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 1052#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 1053 xpmb = "default;";
997#endif 1054#endif
998 break; 1055 break;
999 } 1056 }
1000 1057
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1058 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 1059}
1003 1060
1004/*----------------------------------------------------------------------*/ 1061/*----------------------------------------------------------------------*/
1005 1062
1006int 1063bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1064rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 1065{
1009 if (!screen_in_out->set (display, colour)) 1066 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 1067 return true;
1068
1069 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1070 return false;
1071}
1072
1073void
1074rxvt_term::alias_color (int dst, int src)
1075{
1076 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 1077}
1017 1078
1018/* -------------------------------------------------------------------- * 1079/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 1080 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 1081 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1083rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 1084{
1024 int fix_screen; 1085 int fix_screen;
1025 int old_width = szHint.width; 1086 int old_width = szHint.width;
1026 int old_height = szHint.height; 1087 int old_height = szHint.height;
1027 dDisp;
1028 1088
1029 window_calc (newwidth, newheight); 1089 window_calc (newwidth, newheight);
1090
1091 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1092 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 1093
1032 if (!ignoreparent) 1094 if (!ignoreparent)
1033 { 1095 {
1034#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
1035 /* 1097 /*
… …
1039 int x, y, x1, y1; 1101 int x, y, x1, y1;
1040 int dx, dy; 1102 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1104 Window unused_cr;
1043 1105
1044 XTranslateCoordinates (disp, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1110 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
1051 */ 1113 */
… …
1053 { 1115 {
1054 x -= x1; 1116 x -= x1;
1055 y -= y1; 1117 y -= y1;
1056 } 1118 }
1057 1119
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1120 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1121 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1122 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1123 dy = old_height - szHint.height;
1062 1124
1063 /* Check position of the center of the window */ 1125 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1126 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1130 if (y < y1) /* top half */
1069 dy = 0; 1131 dy = 0;
1070 else if (y == y1) /* exact center */ 1132 else if (y == y1) /* exact center */
1071 dy /= 2; 1133 dy /= 2;
1072 1134
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1135 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1136 szHint.width, szHint.height);
1075#else 1137#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1138 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 1139#endif
1078 } 1140 }
1079 1141
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1142 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1143
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1144 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1145 {
1084 if (scrollBar.state) 1146 if (scrollBar.state)
1085 { 1147 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1148 XMoveResizeWindow (dpy, scrollBar.win,
1087 window_sb_x, 0, 1149 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1150 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1151 resize_scrollbar ();
1090 } 1152 }
1091 1153
1092 XMoveResizeWindow (disp, vt, 1154 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1094 width, height); 1156 width, height);
1095 1157
1158#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ())
1160 update_background ();
1161#endif
1162
1096 scr_clear (); 1163 scr_clear ();
1097#ifdef XPM_BACKGROUND
1098 resize_pixmap ();
1099#endif
1100 } 1164 }
1101 1165
1102 if (fix_screen || old_height == 0) 1166 if (fix_screen || old_height == 0)
1103 scr_reset (); 1167 scr_reset ();
1104 1168
1105#ifdef XPM_BACKGROUND 1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1106 if (pixmap) 1170 //scr_touch (false);
1171
1172#ifdef HAVE_BG_PIXMAP
1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174// if (bgPixmap.pixmap)
1107 scr_touch (false); 1175// scr_touch (false);
1108#endif 1176#endif
1109 1177
1110#ifdef USE_XIM 1178#ifdef USE_XIM
1111 IMSetStatusPosition (); 1179 IMSetPosition ();
1112#endif 1180#endif
1113} 1181}
1114 1182
1115/* 1183/*
1116 * Set the width/height of the vt window in characters. Units are pixels. 1184 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121{ 1189{
1122 XWindowAttributes wattr; 1190 XWindowAttributes wattr;
1123 1191
1124 if (newwidth == 0 || newheight == 0) 1192 if (newwidth == 0 || newheight == 0)
1125 { 1193 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1194 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1195
1128 if (newwidth == 0) 1196 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1197 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1198 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1199 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1213#ifdef USE_XIM
1146 1214
1147void 1215void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1216rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1217{
1150 fg = pix_colors[Color_fg]; 1218 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1219 bg = pix_colors [Color_bg];
1152} 1220}
1153 1221
1154void 1222void
1155rxvt_term::im_set_size (XRectangle &size) 1223rxvt_term::im_set_size (XRectangle &size)
1156{ 1224{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1261 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1262
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1263 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1264 *p = '\0';
1197 1265
1198 atom = XInternAtom (display->display, server, False); 1266 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1267 win = XGetSelectionOwner (dpy, atom);
1200 1268
1201 if (win != None) 1269 if (win != None)
1202 return True; 1270 return True;
1203 } 1271 }
1204 1272
… …
1211 XPoint nspot; 1279 XPoint nspot;
1212 XVaNestedList preedit_attr; 1280 XVaNestedList preedit_attr;
1213 1281
1214 if (!Input_Context 1282 if (!Input_Context
1215 || !focus 1283 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1284 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1285 return;
1218 1286
1219 im_set_position (nspot); 1287 im_set_position (nspot);
1220 1288
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1289 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1283 if (term->rs[Rs_imLocale]) 1351 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale); 1352 SET_LOCALE (term->locale);
1285 } 1353 }
1286 else 1354 else
1287 str = (void *)text->string.wide_char; 1355 str = (void *)text->string.wide_char;
1288 1356
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret, 1358 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first, 1359 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length, 1360 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1361 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1428 "*", 1496 "*",
1429 fheight, 1497 fheight,
1430 fheight + 1, fheight - 1, 1498 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1499 fheight - 2, fheight + 2);
1432 1500
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1501 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1502 &missing_charset_list, &missing_charset_count, &def_string);
1435 1503
1436 if (missing_charset_list) 1504 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1505 XFreeStringList (missing_charset_list);
1438 1506
… …
1479 XNBackground, bg, 1547 XNBackground, bg,
1480 XNArea, &status_rect, 1548 XNArea, &status_rect,
1481 XNFontSet, fs, 1549 XNFontSet, fs,
1482 NULL); 1550 NULL);
1483 } 1551 }
1552#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1553 else if (input_style & XIMPreeditCallbacks)
1485 { 1554 {
1555 im_set_position (spot);
1556
1486 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1557 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1487 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1558 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1488 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1559 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1489#if 0 1560# if 0
1490 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1561 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1491#endif 1562# endif
1492 1563
1493 preedit_attr = XVaCreateNestedList (0, 1564 preedit_attr = XVaCreateNestedList (0,
1565 XNSpotLocation, &spot,
1494 XNPreeditStartCallback, &xcb[0], 1566 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1], 1567 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2], 1568 XNPreeditDrawCallback , &xcb[2],
1497#if 0 1569# if 0
1498 XNPreeditCaretCallback, &xcb[3], 1570 XNPreeditCaretCallback, &xcb[3],
1499#endif 1571# endif
1500 NULL); 1572 NULL);
1501 } 1573 }
1574#endif
1502 1575
1503 Input_Context = XCreateIC (xim, 1576 Input_Context = XCreateIC (xim,
1504 XNInputStyle, input_style, 1577 XNInputStyle, input_style,
1505 XNClientWindow, vt, 1578 XNClientWindow, vt,
1506 XNFocusWindow, parent[0], 1579 XNFocusWindow, parent[0],
… …
1508 preedit_attr, 1581 preedit_attr,
1509 status_attr ? XNStatusAttributes : NULL, 1582 status_attr ? XNStatusAttributes : NULL,
1510 status_attr, NULL); 1583 status_attr, NULL);
1511 1584
1512 if (preedit_attr) XFree (preedit_attr); 1585 if (preedit_attr) XFree (preedit_attr);
1513 if (status_attr) XFree (status_attr); 1586 if (status_attr) XFree (status_attr);
1514 if (fs) XFreeFontSet (display->display, fs); 1587 if (fs) XFreeFontSet (dpy, fs);
1515 1588
1516 if (Input_Context == NULL) 1589 if (Input_Context == NULL)
1517 { 1590 {
1518 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1591 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1519 im_destroy (); 1592 im_destroy ();
… …
1524 // unfortunately, only the focus window is used by XIM, hard to fix 1597 // unfortunately, only the focus window is used by XIM, hard to fix
1525 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1598 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1526 vt_select_input (); 1599 vt_select_input ();
1527#endif 1600#endif
1528 1601
1529 if (input_style & XIMPreeditArea)
1530 IMSetStatusPosition (); 1602 IMSetPosition ();
1531 1603
1532 return true; 1604 return true;
1533} 1605}
1534 1606
1535void 1607void
… …
1593 SET_LOCALE (locale); 1665 SET_LOCALE (locale);
1594#endif 1666#endif
1595} 1667}
1596 1668
1597void 1669void
1598rxvt_term::IMSetStatusPosition () 1670rxvt_term::IMSetPosition ()
1599{ 1671{
1600 XRectangle preedit_rect, status_rect, *needed_rect; 1672 XRectangle preedit_rect, status_rect, *needed_rect;
1601 XVaNestedList preedit_attr, status_attr; 1673 XVaNestedList preedit_attr, status_attr;
1602 1674
1603 if (!Input_Context 1675 if (!Input_Context
1604 || !focus 1676 || !focus
1605 || !(input_style & XIMPreeditArea) 1677 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1606 || !IMisRunning ()) 1678 || !IMisRunning ())
1607 return; 1679 return;
1608 1680
1681 if (input_style & XIMPreeditPosition)
1682 {
1683 im_set_size (preedit_rect);
1684 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1685
1686 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, NULL);
1688 }
1689 else
1690 {
1609 /* Getting the necessary width of preedit area */ 1691 /* Getting the necessary width of preedit area */
1610 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1692 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1611 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1693 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1612 XFree (status_attr); 1694 XFree (status_attr);
1613 1695
1614 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1696 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1615 XFree (needed_rect); 1697 XFree (needed_rect);
1616 1698
1617 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1699 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1618 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1700 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1619 1701
1620 XSetICValues (Input_Context, 1702 XSetICValues (Input_Context,
1621 XNPreeditAttributes, preedit_attr, 1703 XNPreeditAttributes, preedit_attr,
1622 XNStatusAttributes, status_attr, NULL); 1704 XNStatusAttributes, status_attr,
1705 NULL);
1623 1706
1707 XFree (status_attr);
1708 }
1709
1624 XFree (preedit_attr); 1710 XFree (preedit_attr);
1625 XFree (status_attr);
1626} 1711}
1627#endif /* USE_XIM */ 1712#endif /* USE_XIM */
1713
1714void
1715rxvt_term::get_window_origin (int &x, int &y)
1716{
1717 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720}
1721
1722Pixmap
1723rxvt_term::get_pixmap_property (int prop_id)
1724{
1725 if (prop_id > 0 && prop_id < NUM_XA)
1726 if (xa[prop_id])
1727 {
1728 int aformat;
1729 unsigned long nitems, bytes_after;
1730 Atom atype;
1731 unsigned char *prop = NULL;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP)
1736 {
1737 return *(Pixmap *)prop;
1738 }
1739 }
1740 return None;
1741}
1742
1743#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS
1745# undef update_background
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background ()
1754{
1755 bgPixmap.invalidate ();
1756
1757 /* no chance of real time refresh if we are blurring! */
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1759 bgPixmap.render ();
1760 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773}
1774
1775void
1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{
1778 bgPixmap.render ();
1779}
1780
1781#endif /* HAVE_BG_PIXMAP */
1628 1782
1629/*----------------------- end-of-file (C source) -----------------------*/ 1783/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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