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

Diff Legend

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