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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC

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

Diff Legend

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