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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 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 HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 160#endif
154#ifdef CURSOR_BLINK 161#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 163#endif
157#ifdef TEXT_BLINK 164#ifdef TEXT_BLINK
… …
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 175#endif
169#ifdef POINTER_BLANK 176#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 177 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 178#endif
179#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb),
181#endif
182 child_ev (this, &rxvt_term::child_cb),
183 prepare_ev (this, &rxvt_term::prepare_cb),
184 flush_ev (this, &rxvt_term::flush_cb),
185 destroy_ev (this, &rxvt_term::destroy_cb),
186 pty_ev (this, &rxvt_term::pty_cb),
187 incr_ev (this, &rxvt_term::incr_cb)
188{
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
172#ifdef USE_XIM 195#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 196 callback_set (im_ev , this, rxvt_term, im_cb);
174#endif 197#endif
175#ifndef NO_BELL 198 callback_set (termwin_ev , this, rxvt_term, x_cb);
176 bell_ev (this, &rxvt_term::bell_cb), 199 callback_set (vt_ev , this, rxvt_term, x_cb);
177#endif 200
178 termwin_ev (this, &rxvt_term::x_cb),
179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
181 check_ev (this, &rxvt_term::check_cb),
182 flush_ev (this, &rxvt_term::flush_cb),
183 destroy_ev (this, &rxvt_term::destroy_cb),
184 pty_ev (this, &rxvt_term::pty_cb),
185 incr_ev (this, &rxvt_term::incr_cb)
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 202
189 termlist.push_back (this); 203 termlist.push_back (this);
190 204
191#ifdef KEYSYM_RESOURCE 205#ifdef KEYSYM_RESOURCE
… …
193#endif 207#endif
194} 208}
195 209
196// clean up the most important stuff, do *not* call x or free mem etc. 210// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 211// for use before an emergency exit
212void
198void rxvt_term::emergency_cleanup () 213rxvt_term::emergency_cleanup ()
199{ 214{
200 if (cmd_pid) 215 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 216 kill (-cmd_pid, SIGHUP);
202 217
218 pty_ev.stop ();
203 delete pty; pty = 0; 219 delete pty; pty = 0;
204} 220}
205 221
206rxvt_term::~rxvt_term () 222rxvt_term::~rxvt_term ()
207{ 223{
… …
216#endif 232#endif
217 delete fontset[0]; 233 delete fontset[0];
218 234
219 if (display) 235 if (display)
220 { 236 {
221 dDisp;
222
223 selection_clear (); 237 selection_clear ();
224 238
225#ifdef USE_XIM 239#ifdef USE_XIM
226 im_destroy (); 240 im_destroy ();
227#endif 241#endif
228#ifdef XTERM_SCROLLBAR 242#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 245#endif
232#ifdef PLAIN_SCROLLBAR 246#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 248#endif
235#ifdef NEXT_SCROLLBAR 249#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 250 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 251 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 252 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 253 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 254 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 255 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 256 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 257 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 260#endif
247#ifdef RXVT_SCROLLBAR 261#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 265#endif
252 if (gc) XFreeGC (disp, gc); 266 if (gc) XFreeGC (dpy, gc);
253 267
254 delete drawable; 268 delete drawable;
255 // destroy all windows 269 // destroy all windows
256 if (parent[0]) 270 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 271 XDestroyWindow (dpy, parent[0]);
258 }
259 272
260 // TODO: free pixcolours, colours should become part of rxvt_display 273 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 274 if (ISSET_PIXCOLOR (i))
275 {
276 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 277#if OFF_FOCUS_FADING
278 pix_colors_unfocused [i].free (this);
279#endif
280 }
281
282 clear ();
283 }
284
285 delete [] pix_colors_focused;
286#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 287 delete [] pix_colors_unfocused;
264#endif 288#endif
265 289
290#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy ();
292#endif
266 displays.put (display); 293 displays.put (display);
267 294
268 scr_release (); 295 scr_release ();
269 296
270 /* clear all resources */ 297 /* clear all resources */
… …
283 delete argv; 310 delete argv;
284 311
285#ifdef KEYSYM_RESOURCE 312#ifdef KEYSYM_RESOURCE
286 delete keyboard; 313 delete keyboard;
287#endif 314#endif
315#ifndef NO_RESOURCES
316 XrmDestroyDatabase (option_db);
317#endif
288} 318}
289 319
290// child has exited, usually destroys 320// child has exited, usually destroys
291void 321void
292rxvt_term::child_cb (child_watcher &w, int status) 322rxvt_term::child_cb (ev::child &w, int status)
293{ 323{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 324 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 325
296 cmd_pid = 0; 326 cmd_pid = 0;
297 327
298 if (!OPTION (Opt_hold)) 328 if (!option (Opt_hold))
299 destroy (); 329 destroy ();
300} 330}
301 331
302void 332void
303rxvt_term::destroy () 333rxvt_term::destroy ()
… …
317 im_ev.stop (display); 347 im_ev.stop (display);
318#endif 348#endif
319#if HAVE_SCROLLBARS 349#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 350 scrollbar_ev.stop (display);
321#endif 351#endif
322#if TRANSPARENT 352#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 353 rootwin_ev.stop (display);
324#endif 354#endif
325 incr_ev.stop (); 355 incr_ev.stop ();
326 termwin_ev.stop (display); 356 termwin_ev.stop (display);
327 vt_ev.stop (display); 357 vt_ev.stop (display);
328 } 358 }
329 359
330 check_ev.stop (); 360 prepare_ev.stop ();
331 pty_ev.stop (); 361 pty_ev.stop ();
332#ifdef CURSOR_BLINK 362#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 363 cursor_blink_ev.stop ();
334#endif 364#endif
335#ifdef TEXT_BLINK 365#ifdef TEXT_BLINK
… …
343#endif 373#endif
344#ifdef POINTER_BLANK 374#ifdef POINTER_BLANK
345 pointer_ev.stop (); 375 pointer_ev.stop ();
346#endif 376#endif
347 377
348 destroy_ev.start (0); 378 destroy_ev.start ();
349} 379}
350 380
351void 381void
352rxvt_term::destroy_cb (time_watcher &w) 382rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 383{
354 make_current (); 384 make_current ();
355 385
356 delete this; 386 delete this;
357} 387}
… …
368{ 398{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 399 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 400 (*t)->emergency_cleanup ();
371} 401}
372 402
373#if ENABLE_FRILLS 403#if !ENABLE_MINIMAL
374static void 404static void
375print_x_error (Display *dpy, XErrorEvent *event) 405print_x_error (Display *dpy, XErrorEvent *event)
376{ 406{
377 char buffer[BUFSIZ]; 407 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 408 char mesg[BUFSIZ];
… …
411 else 441 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 442 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 443 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 445 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 446 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 447 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 448 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 449}
420#endif 450#endif
421 451
… …
426 GET_R->allowedxerror = event->error_code; 456 GET_R->allowedxerror = event->error_code;
427 else 457 else
428 { 458 {
429 // GET_R is most likely not the terminal which caused the error, 459 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 460 // so just output the error and continue
431#if ENABLE_FRILLS 461#if ENABLE_MINIMAL
462 old_xerror_handler (display, event);
463#else
432 print_x_error (display, event); 464 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 465#endif
436 } 466 }
437 467
438 return 0; 468 return 0;
439} 469}
… …
467#ifdef KEYSYM_RESOURCE 497#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 498 keyboard->register_done ();
469#endif 499#endif
470 500
471#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 502 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 503 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 504#endif
475 505
476 pty = ptytty::create (); 506 pty = ptytty::create ();
477 507
478 create_windows (argc, argv); 508 create_windows (argc, argv);
479 509
480 dDisp;
481
482 init_xlocale (); 510 init_xlocale ();
483 511
484 scr_reset (); // initialize screen 512 scr_reset (); // initialize screen
485 513
486#if 0 514#if 0
487 XSynchronize (disp, True); 515 XSynchronize (dpy, True);
488#endif 516#endif
489 517
490#ifdef HAVE_SCROLLBARS 518#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 519 if (option (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 520 resize_scrollbar (); /* create and map scrollbar */
493#endif 521#endif
522#ifdef HAVE_BG_PIXMAP
523 {
524 bgPixmap.set_target (this);
525
494#ifdef TRANSPARENT 526#ifdef ENABLE_TRANSPARENCY
495 if (OPTION (Opt_transparent)) 527 if (option (Opt_transparent))
496 { 528 {
529 bgPixmap.set_transparent ();
530#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif
534 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]);
538
539 bgPixmap.set_root_pixmap ();
497 XSelectInput (disp, display->root, PropertyChangeMask); 540 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root); 541 rootwin_ev.start (display, display->root);
500 } 542 }
543#endif
544
545#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL)
547 {
548 const char *p = rs[Rs_backgroundPixmap];
549
550 if ((p = strchr (p, ';')) != NULL)
551 {
552 p++;
553 bgPixmap.set_geometry (p);
554 }
555 else
556 bgPixmap.set_defaultGeometry ();
557
558 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559 if (!bgPixmap.window_position_sensitive ())
560 update_background ();
561 }
562#endif
563 }
564#endif
565
566#if ENABLE_PERL
567 rootwin_ev.start (display, display->root);
501#endif 568#endif
502 569
503 set_colorfgbg (); 570 set_colorfgbg ();
504 571
505 init_command (cmd_argv); 572 init_command (cmd_argv);
506 573
507 free (cmd_argv); 574 free (cmd_argv);
508 575
509 if (pty->pty >= 0) 576 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ); 577 pty_ev.start (pty->pty, ev::READ);
511 578
512 check_ev.start (); 579 prepare_ev.start ();
513 580
514 HOOK_INVOKE ((this, HOOK_START, DT_END)); 581 HOOK_INVOKE ((this, HOOK_START, DT_END));
515 582
516#if ENABLE_XEMBED 583#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 584 if (rs[Rs_embed])
518 { 585 {
519 long info[2] = { 0, XEMBED_MAPPED }; 586 long info[2] = { 0, XEMBED_MAPPED };
520 587
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 588 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 589 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 590 }
524#endif 591#endif
525 592
526 XMapWindow (disp, vt); 593 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 594 XMapWindow (dpy, parent[0]);
528 595
529 return true; 596 return true;
530} 597}
531 598
532static struct sig_handlers 599static struct sig_handlers
533{ 600{
534 sig_watcher sw_term, sw_int; 601 ev::sig sw_term, sw_int;
535 602
536 /* 603 /*
537 * Catch a fatal signal and tidy up before quitting 604 * Catch a fatal signal and tidy up before quitting
538 */ 605 */
539 void 606 void
540 sig_term (sig_watcher &w) 607 sig_term (ev::sig &w, int revents)
541 { 608 {
542 rxvt_emergency_cleanup (); 609 rxvt_emergency_cleanup ();
543 signal (w.signum, SIG_DFL); 610 w.stop ();
544 kill (getpid (), w.signum); 611 kill (getpid (), w.signum);
545 } 612 }
546 613
547 sig_handlers () 614 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term), 615 : sw_term (this, &sig_handlers::sig_term),
… …
556void 623void
557rxvt_init () 624rxvt_init ()
558{ 625{
559 ptytty::init (); 626 ptytty::init ();
560 627
628 if (!ev_default_loop (0))
629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
630
561 rxvt_environ = environ; 631 rxvt_environ = environ;
562 632
563 signal (SIGHUP, SIG_IGN); 633 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 634 signal (SIGPIPE, SIG_IGN);
565 635
566 sig_handlers.sw_term.start (SIGTERM); 636 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 637 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568 638
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */ 640 /* signal (SIGURG, SIG_DFL); */
571 641
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
612 return p; 682 return p;
613} 683}
614 684
615/*----------------------------------------------------------------------*/ 685/*----------------------------------------------------------------------*/
616/* 686/*
617 * window size/position calculcations for XSizeHint and other storage. 687 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 688 * if width/height are non-zero then override calculated width/height
619 */ 689 */
620void 690void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 691rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 692{
623 short recalc_x, recalc_y; 693 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 694 int x, y, sb_w, flags;
625 unsigned int w, h; 695 unsigned int w, h;
626 unsigned int max_width, max_height; 696 unsigned int max_width, max_height;
627 dDisp;
628 697
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 698 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 699 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 700 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 701
… …
694 763
695 if (scrollBar.state) 764 if (scrollBar.state)
696 { 765 {
697 sb_w = scrollbar_TotalWidth (); 766 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 767 szHint.base_width += sb_w;
768
699 if (!OPTION (Opt_scrollBar_right)) 769 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 770 window_vt_x += sb_w;
701 } 771 }
702 772
703 szHint.width_inc = fwidth; 773 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 774 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 775 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 776 szHint.min_height = szHint.base_height + szHint.height_inc;
707 777
708 if (newwidth && newwidth - szHint.base_width < max_width) 778 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 779 {
710 szHint.width = newwidth; 780 szHint.width = newwidth;
… …
725 { 795 {
726 min_it (height, max_height); 796 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 797 szHint.height = szHint.base_height + height;
728 } 798 }
729 799
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 800 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 801 window_sb_x = szHint.width - sb_w;
732 802
733 if (recalc_x) 803 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 804 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805
735 if (recalc_y) 806 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 807 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 808
738 ncol = width / fwidth; 809 ncol = width / fwidth;
739 nrow = height / fheight; 810 nrow = height / fheight;
740} 811}
741 812
… …
796 delete fontset[0]; 867 delete fontset[0];
797 fontset[0] = fs; 868 fontset[0] = fs;
798 869
799 prop = (*fs)[1]->properties (); 870 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 871 prop.height += lineSpace;
872
801 fs->set_prop (prop); 873 fs->set_prop (prop, false);
802 874
803 fwidth = prop.width; 875 fwidth = prop.width;
804 fheight = prop.height; 876 fheight = prop.height;
805 fbase = prop.ascent; 877 fbase = prop.ascent;
806 878
… …
815 { 887 {
816 fontset[style] = fs = new rxvt_fontset (this); 888 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 889 rxvt_fontprop prop2 = prop;
818 890
819 if (res) 891 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 892 {
893 fs->populate (res);
894 fs->set_prop (prop2, false);
895 }
821 else 896 else
822 { 897 {
823 res = fontset[0]->fontdesc; 898 fs->populate (fontset[0]->fontdesc);
824 899
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 900 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; 901 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
902
903 fs->set_prop (prop2, true);
827 } 904 }
828 905
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 906 }
832#else 907#else
833 fontset[style] = fontset[0]; 908 fontset[style] = fontset[0];
834#endif 909#endif
835 } 910 }
… …
837 if (parent[0]) 912 if (parent[0])
838 { 913 {
839 resize_all_windows (0, 0, 0); 914 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 915 scr_remap_chars ();
841 scr_touch (true); 916 scr_touch (true);
842 } 917 }
843 918
844 return true; 919 return true;
845} 920}
846 921
922void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 923rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 924{
849 XChangeProperty (display->display, parent[0], 925 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 926 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 927 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 928}
853 929
930void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 931rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 932{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 933 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 934 char *s = rxvt_wcstoutf8 (ws);
858 935
859 XChangeProperty (display->display, parent[0], 936 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 937 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 938 (const unsigned char *)s, strlen (s));
862 939
863 free (s); 940 free (s);
864 free (ws); 941 free (ws);
… …
883#if ENABLE_EWMH 960#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 961 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 962#endif
886} 963}
887 964
965void
966rxvt_term::set_window_color (int idx, const char *color)
967{
888#ifdef XTERM_COLOR_CHANGE 968#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 969 rxvt_color xcol;
893 int i; 970 int i;
894 971
895 if (color == NULL || *color == '\0') 972 if (color == NULL || *color == '\0')
896 return; 973 return;
897 974
975 color = strdup (color);
976 allocated.push_back ((void *)color);
977 rs[Rs_color + idx] = color;
978
898 /* handle color aliases */ 979 /* handle color aliases */
899 if (isdigit (*color)) 980 if (isdigit (*color))
900 { 981 {
901 i = atoi (color); 982 i = atoi (color);
902 983
903 if (i >= 8 && i <= 15) 984 if (i >= 8 && i <= 15)
985 {
904 { /* bright colors */ 986 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 988 goto done;
909 } 989 }
910 990
911 if (i >= 0 && i <= 7) 991 if (i >= 0 && i <= 7)
992 {
912 { /* normal colors */ 993 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 994 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 995 goto done;
916 } 996 }
917 } 997 }
918 998
919 if (!rXParseAllocColor (&xcol, color)) 999 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 1000
924 /* 1001 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 1002 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 1003 * so just keep gobbling up the colormap
927 */ 1004 */
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 1005
940 pix_colors_focused[idx] = xcol; 1006 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 1007
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 1008done:
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. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
953 1010
1011 update_fade_color (idx);
954 recolour_cursor (); 1012 recolour_cursor ();
955 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
956} 1015}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 1016
962void 1017void
963rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
964{ 1019{
965 XColor xcol[2]; 1020 XColor fg, bg;
966 1021
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1022 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 1023 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 1024 : pix_colors_focused[Color_fg]).get (fg);
1025
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1026 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 1027 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 1028 : pix_colors_focused[Color_bg]).get (bg);
973 1029
974 XQueryColors (display->display, display->cmap, xcol, 2); 1030 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 1031}
977 1032
978/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
979/* 1034/*
980 * 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
981 */ 1036 */
982void 1037void
983rxvt_term::set_colorfgbg () 1038rxvt_term::set_colorfgbg ()
984{ 1039{
985 unsigned int i; 1040 unsigned int i;
986 const char *xpmb = "\0"; 1041 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988 1043
989 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
990 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
… …
997 1052
998 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 1055 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 1058 xpmb = "default;";
1004#endif 1059#endif
1005 break; 1060 break;
1006 } 1061 }
1007 1062
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1064}
1010 1065
1011/*----------------------------------------------------------------------*/ 1066/*----------------------------------------------------------------------*/
1012 1067
1013int 1068bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1069rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1070{
1016 if (!screen_in_out->set (display, colour)) 1071 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; 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]);
1023} 1082}
1024 1083
1025/* -------------------------------------------------------------------- * 1084/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1085 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1086 * -------------------------------------------------------------------- */
… …
1029rxvt_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)
1030{ 1089{
1031 int fix_screen; 1090 int fix_screen;
1032 int old_width = szHint.width; 1091 int old_width = szHint.width;
1033 int old_height = szHint.height; 1092 int old_height = szHint.height;
1034 dDisp;
1035 1093
1036 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)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1097 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1098
1039 if (!ignoreparent) 1099 if (!ignoreparent)
1040 { 1100 {
1041#ifdef SMART_RESIZE 1101#ifdef SMART_RESIZE
1042 /* 1102 /*
… …
1046 int x, y, x1, y1; 1106 int x, y, x1, y1;
1047 int dx, dy; 1107 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1109 Window unused_cr;
1050 1110
1051 XTranslateCoordinates (disp, parent[0], display->root, 1111 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1112 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1115 /*
1056 * 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
1057 * our position for handles and decorations. Counter it 1117 * our position for handles and decorations. Counter it
1058 */ 1118 */
… …
1060 { 1120 {
1061 x -= x1; 1121 x -= x1;
1062 y -= y1; 1122 y -= y1;
1063 } 1123 }
1064 1124
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1125 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1126 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1127 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1128 dy = old_height - szHint.height;
1069 1129
1070 /* Check position of the center of the window */ 1130 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1131 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1135 if (y < y1) /* top half */
1076 dy = 0; 1136 dy = 0;
1077 else if (y == y1) /* exact center */ 1137 else if (y == y1) /* exact center */
1078 dy /= 2; 1138 dy /= 2;
1079 1139
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1141 szHint.width, szHint.height);
1082#else 1142#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1144#endif
1085 } 1145 }
1086 1146
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1148
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1150 {
1091 if (scrollBar.state) 1151 if (scrollBar.state)
1092 { 1152 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1153 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1154 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1155 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1156 resize_scrollbar ();
1097 } 1157 }
1098 1158
1099 XMoveResizeWindow (disp, vt, 1159 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1101 width, height); 1161 width, height);
1102 1162
1163#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ())
1165 update_background ();
1166#endif
1167
1103 scr_clear (); 1168 scr_clear ();
1104#ifdef XPM_BACKGROUND
1105 resize_pixmap ();
1106#endif
1107 } 1169 }
1108 1170
1109 if (fix_screen || old_height == 0) 1171 if (fix_screen || old_height == 0)
1110 scr_reset (); 1172 scr_reset ();
1111 1173
1112#ifdef XPM_BACKGROUND 1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113 if (pixmap) 1175 //scr_touch (false);
1176
1177#ifdef HAVE_BG_PIXMAP
1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179// if (bgPixmap.pixmap)
1114 scr_touch (false); 1180// scr_touch (false);
1115#endif 1181#endif
1116 1182
1117#ifdef USE_XIM 1183#ifdef USE_XIM
1118 IMSetStatusPosition (); 1184 IMSetPosition ();
1119#endif 1185#endif
1120} 1186}
1121 1187
1122/* 1188/*
1123 * 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.
… …
1128{ 1194{
1129 XWindowAttributes wattr; 1195 XWindowAttributes wattr;
1130 1196
1131 if (newwidth == 0 || newheight == 0) 1197 if (newwidth == 0 || newheight == 0)
1132 { 1198 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1199 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1200
1135 if (newwidth == 0) 1201 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1202 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1203 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1204 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1218#ifdef USE_XIM
1153 1219
1154void 1220void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1221rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1222{
1157 fg = pix_colors[Color_fg]; 1223 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1224 bg = pix_colors [Color_bg];
1159} 1225}
1160 1226
1161void 1227void
1162rxvt_term::im_set_size (XRectangle &size) 1228rxvt_term::im_set_size (XRectangle &size)
1163{ 1229{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1267
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1269 *p = '\0';
1204 1270
1205 atom = XInternAtom (display->display, server, False); 1271 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1272 win = XGetSelectionOwner (dpy, atom);
1207 1273
1208 if (win != None) 1274 if (win != None)
1209 return True; 1275 return True;
1210 } 1276 }
1211 1277
… …
1290 if (term->rs[Rs_imLocale]) 1356 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1357 SET_LOCALE (term->locale);
1292 } 1358 }
1293 else 1359 else
1294 str = (void *)text->string.wide_char; 1360 str = (void *)text->string.wide_char;
1295 1361
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1363 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1364 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1365 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1435 "*", 1501 "*",
1436 fheight, 1502 fheight,
1437 fheight + 1, fheight - 1, 1503 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1504 fheight - 2, fheight + 2);
1439 1505
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1506 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1507 &missing_charset_list, &missing_charset_count, &def_string);
1442 1508
1443 if (missing_charset_list) 1509 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1510 XFreeStringList (missing_charset_list);
1445 1511
… …
1486 XNBackground, bg, 1552 XNBackground, bg,
1487 XNArea, &status_rect, 1553 XNArea, &status_rect,
1488 XNFontSet, fs, 1554 XNFontSet, fs,
1489 NULL); 1555 NULL);
1490 } 1556 }
1557#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1558 else if (input_style & XIMPreeditCallbacks)
1492 { 1559 {
1493 im_set_position (spot); 1560 im_set_position (spot);
1494 1561
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1563 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1564 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1565# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1566 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1567# endif
1501 1568
1502 preedit_attr = XVaCreateNestedList (0, 1569 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1570 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1571 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1572 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1573 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1574# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1575 XNPreeditCaretCallback, &xcb[3],
1509#endif 1576# endif
1510 NULL); 1577 NULL);
1511 } 1578 }
1579#endif
1512 1580
1513 Input_Context = XCreateIC (xim, 1581 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1582 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1583 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1584 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1586 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1587 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1588 status_attr, NULL);
1521 1589
1522 if (preedit_attr) XFree (preedit_attr); 1590 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1591 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1592 if (fs) XFreeFontSet (dpy, fs);
1525 1593
1526 if (Input_Context == NULL) 1594 if (Input_Context == NULL)
1527 { 1595 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1596 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1597 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1602 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1604 vt_select_input ();
1537#endif 1605#endif
1538 1606
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1607 IMSetPosition ();
1541 1608
1542 return true; 1609 return true;
1543} 1610}
1544 1611
1545void 1612void
… …
1603 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1604#endif 1671#endif
1605} 1672}
1606 1673
1607void 1674void
1608rxvt_term::IMSetStatusPosition () 1675rxvt_term::IMSetPosition ()
1609{ 1676{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1677 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1678 XVaNestedList preedit_attr, status_attr;
1612 1679
1613 if (!Input_Context 1680 if (!Input_Context
1614 || !focus 1681 || !focus
1615 || !(input_style & XIMPreeditArea) 1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1683 || !IMisRunning ())
1617 return; 1684 return;
1618 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 {
1619 /* Getting the necessary width of preedit area */ 1696 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1698 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1699 XFree (status_attr);
1623 1700
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1701 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1702 XFree (needed_rect);
1626 1703
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1704 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1705 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1706
1630 XSetICValues (Input_Context, 1707 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1708 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1709 XNStatusAttributes, status_attr,
1710 NULL);
1633 1711
1712 XFree (status_attr);
1713 }
1714
1634 XFree (preedit_attr); 1715 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1716}
1637#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
1757
1758int
1759rxvt_term::update_background ()
1760{
1761 bgPixmap.invalidate ();
1762
1763 /* no chance of real time refresh if we are blurring! */
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1765 bgPixmap.render ();
1766 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779}
1780
1781void
1782rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{
1784 bgPixmap.render ();
1785}
1786
1787#endif /* HAVE_BG_PIXMAP */
1638 1788
1639/*----------------------- end-of-file (C source) -----------------------*/ 1789/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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