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.197 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.268 by root, Tue Nov 27 17:52:51 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 ()
306{ 333{
307 if (destroy_ev.active) 334 if (destroy_ev.active)
308 return; 335 return;
309 336
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 338
313#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
314 scr_overlay_off (); 340 scr_overlay_off ();
315#endif 341#endif
316 342
… …
320 im_ev.stop (display); 346 im_ev.stop (display);
321#endif 347#endif
322#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
324#endif 350#endif
325#if TRANSPARENT 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
327#endif 353#endif
328 incr_ev.stop (); 354 incr_ev.stop ();
329 termwin_ev.stop (display); 355 termwin_ev.stop (display);
330 vt_ev.stop (display); 356 vt_ev.stop (display);
331 } 357 }
332 358
333 check_ev.stop (); 359 prepare_ev.stop ();
334 pty_ev.stop (); 360 pty_ev.stop ();
335#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
337#endif 363#endif
338#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
346#endif 372#endif
347#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
348 pointer_ev.stop (); 374 pointer_ev.stop ();
349#endif 375#endif
350 376
351 destroy_ev.start (0); 377 destroy_ev.start ();
352} 378}
353 379
354void 380void
355rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 382{
357 make_current (); 383 make_current ();
358 384
359 delete this; 385 delete this;
360} 386}
… …
371{ 397{
372 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++)
373 (*t)->emergency_cleanup (); 399 (*t)->emergency_cleanup ();
374} 400}
375 401
376#if ENABLE_FRILLS 402#if !ENABLE_MINIMAL
377static void 403static void
378print_x_error (Display *dpy, XErrorEvent *event) 404print_x_error (Display *dpy, XErrorEvent *event)
379{ 405{
380 char buffer[BUFSIZ]; 406 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 407 char mesg[BUFSIZ];
… …
414 else 440 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 442 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 444 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 446 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 448}
423#endif 449#endif
424 450
… …
429 GET_R->allowedxerror = event->error_code; 455 GET_R->allowedxerror = event->error_code;
430 else 456 else
431 { 457 {
432 // 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,
433 // so just output the error and continue 459 // so just output the error and continue
434#if ENABLE_FRILLS 460#if ENABLE_MINIMAL
461 old_xerror_handler (display, event);
462#else
435 print_x_error (display, event); 463 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 464#endif
439 } 465 }
440 466
441 return 0; 467 return 0;
442} 468}
… …
470#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 497 keyboard->register_done ();
472#endif 498#endif
473 499
474#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 503#endif
478 504
479 pty = ptytty::create (); 505 pty = ptytty::create ();
480 506
481 create_windows (argc, argv); 507 create_windows (argc, argv);
482 508
483 dDisp;
484
485 init_xlocale (); 509 init_xlocale ();
486 510
487 scr_reset (); // initialize screen 511 scr_reset (); // initialize screen
488 512
489#if 0 513#if 0
490 XSynchronize (disp, True); 514 XSynchronize (dpy, True);
491#endif 515#endif
492 516
493#ifdef HAVE_SCROLLBARS 517#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 518 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 519 resize_scrollbar (); /* create and map scrollbar */
496#endif 520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
497#ifdef TRANSPARENT 525#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 526 if (option (Opt_transparent))
499 { 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 ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
503 } 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);
504#endif 567#endif
505 568
506 set_colorfgbg (); 569 set_colorfgbg ();
507 570
508 init_command (cmd_argv); 571 init_command (cmd_argv);
509 572
510 free (cmd_argv); 573 free (cmd_argv);
511 574
512 if (pty->pty >= 0) 575 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
514 577
515 check_ev.start (); 578 prepare_ev.start ();
516 579
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
519 XMapWindow (disp, vt); 592 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 593 XMapWindow (dpy, parent[0]);
521 594
522 return true; 595 return true;
523} 596}
524 597
525static struct sig_handlers 598static struct sig_handlers
526{ 599{
527 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
528 601
529 /* 602 /*
530 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
531 */ 604 */
532 void 605 void
533 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
534 { 607 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 609 w.stop ();
540 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
541 } 611 }
542 612
543 sig_handlers () 613 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
552void 622void
553rxvt_init () 623rxvt_init ()
554{ 624{
555 ptytty::init (); 625 ptytty::init ();
556 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
557 rxvt_environ = environ; 630 rxvt_environ = environ;
558 631
559 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
560 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
561 634
562 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
563 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
564 637
565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
566 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
567 640
568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
608 return p; 681 return p;
609} 682}
610 683
611/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
612/* 685/*
613 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
614 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
615 */ 688 */
616void 689void
617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
618{ 691{
619 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
620 int x, y, sb_w, flags; 693 int x, y, sb_w, flags;
621 unsigned int w, h; 694 unsigned int w, h;
622 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
623 dDisp;
624
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627 696
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 700
… …
693 762
694 if (scrollBar.state) 763 if (scrollBar.state)
695 { 764 {
696 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
697 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
698 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
699 window_vt_x += sb_w; 769 window_vt_x += sb_w;
700 } 770 }
701 771
702 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
703 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
704 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
705 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
706 776
707 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
708 { 778 {
709 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
724 { 794 {
725 min_it (height, max_height); 795 min_it (height, max_height);
726 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
727 } 797 }
728 798
729 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
730 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
731 801
732 if (recalc_x) 802 if (recalc_x)
733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
734 if (recalc_y) 805 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 807
737 ncol = width / fwidth; 808 ncol = width / fwidth;
738 nrow = height / fheight; 809 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 810}
744 811
745/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
746/* 813/*
747 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
… …
799 delete fontset[0]; 866 delete fontset[0];
800 fontset[0] = fs; 867 fontset[0] = fs;
801 868
802 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
803 prop.height += lineSpace; 870 prop.height += lineSpace;
871
804 fs->set_prop (prop); 872 fs->set_prop (prop, false);
805 873
806 fwidth = prop.width; 874 fwidth = prop.width;
807 fheight = prop.height; 875 fheight = prop.height;
808 fbase = prop.ascent; 876 fbase = prop.ascent;
809 877
… …
818 { 886 {
819 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
820 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
821 889
822 if (res) 890 if (res)
823 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
824 else 895 else
825 { 896 {
826 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
827 898
828 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;
829 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);
830 } 903 }
831 904
832 fs->populate (res);
833 fs->set_prop (prop2);
834 } 905 }
835#else 906#else
836 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
837#endif 908#endif
838 } 909 }
… …
840 if (parent[0]) 911 if (parent[0])
841 { 912 {
842 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
843 scr_remap_chars (); 914 scr_remap_chars ();
844 scr_touch (true); 915 scr_touch (true);
845 } 916 }
846 917
847 return true; 918 return true;
848} 919}
849 920
921void
850void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
851{ 923{
852 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
853 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
854 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
855} 927}
856 928
929void
857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
858{ 931{
859 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
860 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
861 934
862 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
864 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
865 938
866 free (s); 939 free (s);
867 free (ws); 940 free (ws);
… …
886#if ENABLE_EWMH 959#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
888#endif 961#endif
889} 962}
890 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
891#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
892void
893rxvt_term::set_window_color (int idx, const char *color)
894{
895 rxvt_color xcol; 968 rxvt_color xcol;
896 int i; 969 int i;
897 970
898 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
899 return; 972 return;
900 973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
977
901 /* handle color aliases */ 978 /* handle color aliases */
902 if (isdigit (*color)) 979 if (isdigit (*color))
903 { 980 {
904 i = atoi (color); 981 i = atoi (color);
905 982
906 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
907 { /* bright colors */ 985 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 SET_PIXCOLOR (idx);
911 goto done; 987 goto done;
912 } 988 }
913 989
914 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
915 { /* normal colors */ 992 /* normal colors */
916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
917 SET_PIXCOLOR (idx);
918 goto done; 994 goto done;
919 } 995 }
920 } 996 }
921 997
922 if (!rXParseAllocColor (&xcol, color)) 998 set_color (xcol, color);
923 return;
924
925 /* XStoreColor (display->display, display->cmap, XColor*); */
926 999
927 /* 1000 /*
928 * FIXME: should free colors here, but no idea how to do it so instead, 1001 * FIXME: should free colors here, but no idea how to do it so instead,
929 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
930 */ 1003 */
931# if 0
932 for (i = Color_Black; i <= Color_White; i++)
933 if (pix_colors[idx] == pix_colors[i])
934 break;
935 if (i > Color_White)
936 {
937 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
938 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
939 DisplayPlanes (display->display, display->screen));
940 }
941# endif
942 1004
943 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
944 SET_PIXCOLOR (idx);
945 1006
946 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */
948done: 1007done:
949
950#if OFF_FOCUS_FADING
951 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif
954
955 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
956 1009
1010 update_fade_color (idx);
957 recolour_cursor (); 1011 recolour_cursor ();
958 scr_recolour (); 1012 scr_recolour ();
1013#endif /* XTERM_COLOR_CHANGE */
959} 1014}
960
961#else
962# define set_window_color (idx,color) ((void)0)
963#endif /* XTERM_COLOR_CHANGE */
964 1015
965void 1016void
966rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
967{ 1018{
968 XColor xcol[2]; 1019 XColor fg, bg;
969 1020
970 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1021 (ISSET_PIXCOLOR (Color_pointer_fg)
971 ? pix_colors_focused[Color_pointer_fg] 1022 ? pix_colors_focused[Color_pointer_fg]
972 : pix_colors_focused[Color_fg]; 1023 : pix_colors_focused[Color_fg]).get (fg);
1024
973 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1025 (ISSET_PIXCOLOR (Color_pointer_bg)
974 ? pix_colors_focused[Color_pointer_bg] 1026 ? pix_colors_focused[Color_pointer_bg]
975 : pix_colors_focused[Color_bg]; 1027 : pix_colors_focused[Color_bg]).get (bg);
976 1028
977 XQueryColors (display->display, display->cmap, xcol, 2); 1029 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
979} 1030}
980 1031
981/*----------------------------------------------------------------------*/ 1032/*----------------------------------------------------------------------*/
982/* 1033/*
983 * find if fg/bg matches any of the normal (low-intensity) colors 1034 * find if fg/bg matches any of the normal (low-intensity) colors
984 */ 1035 */
985void 1036void
986rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
987{ 1038{
988 unsigned int i; 1039 unsigned int i;
989 const char *xpmb = "\0"; 1040 const char *xpmb = "";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 1042
992 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
993 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
994 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
995 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
996 if (pix_colors[Color_fg] == pix_colors[i]) 1046 if (pix_colors[Color_fg] == pix_colors[i])
997 { 1047 {
… …
1001 1051
1002 for (i = Color_Black; i <= Color_White; i++) 1052 for (i = Color_Black; i <= Color_White; i++)
1003 if (pix_colors[Color_bg] == pix_colors[i]) 1053 if (pix_colors[Color_bg] == pix_colors[i])
1004 { 1054 {
1005 sprintf (bstr, "%d", (i - Color_Black)); 1055 sprintf (bstr, "%d", (i - Color_Black));
1006#ifdef XPM_BACKGROUND 1056#ifdef BG_IMAGE_FROM_FILE
1007 xpmb = "default;"; 1057 xpmb = "default;";
1008#endif 1058#endif
1009 break; 1059 break;
1010 } 1060 }
1011 1061
1012 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1062 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1013} 1063}
1014 1064
1015/*----------------------------------------------------------------------*/ 1065/*----------------------------------------------------------------------*/
1016 1066
1017int 1067bool
1018rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1068rxvt_term::set_color (rxvt_color &color, const char *name)
1019{ 1069{
1020 if (!screen_in_out->set (display, colour)) 1070 if (color.set (this, name))
1021 {
1022 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1023 return false;
1024 }
1025
1026 return true; 1071 return true;
1072
1073 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1074 return false;
1075}
1076
1077void
1078rxvt_term::alias_color (int dst, int src)
1079{
1080 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1027} 1081}
1028 1082
1029/* -------------------------------------------------------------------- * 1083/* -------------------------------------------------------------------- *
1030 * - WINDOW RESIZING - * 1084 * - WINDOW RESIZING - *
1031 * -------------------------------------------------------------------- */ 1085 * -------------------------------------------------------------------- */
… …
1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1087rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1034{ 1088{
1035 int fix_screen; 1089 int fix_screen;
1036 int old_width = szHint.width; 1090 int old_width = szHint.width;
1037 int old_height = szHint.height; 1091 int old_height = szHint.height;
1038 dDisp;
1039 1092
1040 window_calc (newwidth, newheight); 1093 window_calc (newwidth, newheight);
1094
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1041 XSetWMNormalHints (disp, parent[0], &szHint); 1096 XSetWMNormalHints (dpy, parent[0], &szHint);
1042 1097
1043 if (!ignoreparent) 1098 if (!ignoreparent)
1044 { 1099 {
1045#ifdef SMART_RESIZE 1100#ifdef SMART_RESIZE
1046 /* 1101 /*
… …
1050 int x, y, x1, y1; 1105 int x, y, x1, y1;
1051 int dx, dy; 1106 int dx, dy;
1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1053 Window unused_cr; 1108 Window unused_cr;
1054 1109
1055 XTranslateCoordinates (disp, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent[0], display->root,
1056 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1059 /* 1114 /*
1060 * if display->root isn't the parent window, a WM will probably have offset 1115 * if display->root isn't the parent window, a WM will probably have offset
1061 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
1062 */ 1117 */
… …
1064 { 1119 {
1065 x -= x1; 1120 x -= x1;
1066 y -= y1; 1121 y -= y1;
1067 } 1122 }
1068 1123
1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1124 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1125 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1071 dx = old_width - szHint.width; 1126 dx = old_width - szHint.width;
1072 dy = old_height - szHint.height; 1127 dy = old_height - szHint.height;
1073 1128
1074 /* Check position of the center of the window */ 1129 /* Check position of the center of the window */
1075 if (x < x1) /* left half */ 1130 if (x < x1) /* left half */
… …
1079 if (y < y1) /* top half */ 1134 if (y < y1) /* top half */
1080 dy = 0; 1135 dy = 0;
1081 else if (y == y1) /* exact center */ 1136 else if (y == y1) /* exact center */
1082 dy /= 2; 1137 dy /= 2;
1083 1138
1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1139 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1085 szHint.width, szHint.height); 1140 szHint.width, szHint.height);
1086#else 1141#else
1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1088#endif 1143#endif
1089 } 1144 }
1090 1145
1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1092 1147
1093 if (fix_screen || newwidth != old_width || newheight != old_height) 1148 if (fix_screen || newwidth != old_width || newheight != old_height)
1094 { 1149 {
1095 if (scrollBar.state) 1150 if (scrollBar.state)
1096 { 1151 {
1097 XMoveResizeWindow (disp, scrollBar.win, 1152 XMoveResizeWindow (dpy, scrollBar.win,
1098 window_sb_x, 0, 1153 window_sb_x, 0,
1099 scrollbar_TotalWidth (), szHint.height); 1154 scrollbar_TotalWidth (), szHint.height);
1100 resize_scrollbar (); 1155 resize_scrollbar ();
1101 } 1156 }
1102 1157
1103 XMoveResizeWindow (disp, vt, 1158 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1105 width, height); 1160 width, height);
1106 1161
1162#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ())
1164 update_background ();
1165#endif
1166
1107 scr_clear (); 1167 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1168 }
1112 1169
1113 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1114 scr_reset (); 1171 scr_reset ();
1115 1172
1116#ifdef XPM_BACKGROUND 1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 if (pixmap) 1174 //scr_touch (false);
1175
1176#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap)
1118 scr_touch (false); 1179// scr_touch (false);
1119#endif 1180#endif
1120 1181
1121#ifdef USE_XIM 1182#ifdef USE_XIM
1122 IMSetStatusPosition (); 1183 IMSetPosition ();
1123#endif 1184#endif
1124} 1185}
1125 1186
1126/* 1187/*
1127 * Set the width/height of the vt window in characters. Units are pixels. 1188 * Set the width/height of the vt window in characters. Units are pixels.
… …
1132{ 1193{
1133 XWindowAttributes wattr; 1194 XWindowAttributes wattr;
1134 1195
1135 if (newwidth == 0 || newheight == 0) 1196 if (newwidth == 0 || newheight == 0)
1136 { 1197 {
1137 XGetWindowAttributes (display->display, display->root, &wattr); 1198 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1199
1139 if (newwidth == 0) 1200 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1201 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1202 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1203 newheight = wattr.height - szHint.base_height;
… …
1156#ifdef USE_XIM 1217#ifdef USE_XIM
1157 1218
1158void 1219void
1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1220rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1160{ 1221{
1161 fg = pix_colors[Color_fg]; 1222 fg = pix_colors [Color_fg];
1162 bg = pix_colors[Color_bg]; 1223 bg = pix_colors [Color_bg];
1163} 1224}
1164 1225
1165void 1226void
1166rxvt_term::im_set_size (XRectangle &size) 1227rxvt_term::im_set_size (XRectangle &size)
1167{ 1228{
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1266
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1268 *p = '\0';
1208 1269
1209 atom = XInternAtom (display->display, server, False); 1270 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (display->display, atom); 1271 win = XGetSelectionOwner (dpy, atom);
1211 1272
1212 if (win != None) 1273 if (win != None)
1213 return True; 1274 return True;
1214 } 1275 }
1215 1276
… …
1222 XPoint nspot; 1283 XPoint nspot;
1223 XVaNestedList preedit_attr; 1284 XVaNestedList preedit_attr;
1224 1285
1225 if (!Input_Context 1286 if (!Input_Context
1226 || !focus 1287 || !focus
1227 || !(input_style & XIMPreeditPosition)) 1288 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1228 return; 1289 return;
1229 1290
1230 im_set_position (nspot); 1291 im_set_position (nspot);
1231 1292
1232 if (nspot.x == spot.x && nspot.y == spot.y) 1293 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1251 input_method = 0; 1312 input_method = 0;
1252 } 1313 }
1253 1314
1254 Input_Context = 0; 1315 Input_Context = 0;
1255} 1316}
1317
1318#ifdef ENABLE_XIM_ONTHESPOT
1319
1320static void
1321xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1325}
1326
1327static void
1328xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1329{
1330 ((rxvt_term *)client_data)->make_current ();
1331 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1332}
1333
1334static void
1335xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1336{
1337 rxvt_term *term = (rxvt_term *)client_data;
1338 XIMText *text = call_data->text;
1339
1340 term->make_current ();
1341
1342 if (text)
1343 {
1344 void *str;
1345
1346 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 {
1348 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]);
1351
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1354
1355 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale);
1357 }
1358 else
1359 str = (void *)text->string.wide_char;
1360
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length,
1365 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1366 DT_WCS_LEN, str, str ? (int)text->length : 0,
1367 DT_END));
1368 }
1369 else
1370 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1371 DT_INT, call_data->caret,
1372 DT_INT, call_data->chg_first,
1373 DT_INT, call_data->chg_length,
1374 DT_END));
1375}
1376
1377#if 0
1378static void
1379xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1380{
1381 ((rxvt_term *)client_data)->make_current ();
1382 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1383 DT_INT, call_data->position,
1384 DT_INT, call_data->direction,
1385 DT_INT, call_data->style,
1386 DT_END));
1387}
1388#endif
1389
1390#endif
1256 1391
1257/* 1392/*
1258 * Try to open a XIM with the current modifiers, then see if we can 1393 * Try to open a XIM with the current modifiers, then see if we can
1259 * open a suitable preedit type 1394 * open a suitable preedit type
1260 */ 1395 */
… …
1267 XRectangle rect, status_rect, needed_rect; 1402 XRectangle rect, status_rect, needed_rect;
1268 unsigned long fg, bg; 1403 unsigned long fg, bg;
1269 const char *p; 1404 const char *p;
1270 char **s; 1405 char **s;
1271 XIMStyles *xim_styles; 1406 XIMStyles *xim_styles;
1407#ifdef ENABLE_XIM_ONTHESPOT
1408 XIMCallback xcb[4];
1409#endif
1272 1410
1273 set_environ (envv); 1411 set_environ (envv);
1274 1412
1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1413 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1276 return false; 1414 return false;
1277 1415
1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1279 input_method = display->get_xim (locale, modifiers); 1416 input_method = display->get_xim (locale, modifiers);
1280 if (input_method == NULL) 1417 if (input_method == NULL)
1281 return false; 1418 return false;
1282 1419
1283 xim = input_method->xim; 1420 xim = input_method->xim;
… …
1303 s = rxvt_splitcommastring (p); 1440 s = rxvt_splitcommastring (p);
1304 1441
1305 for (i = found = 0; !found && s[i]; i++) 1442 for (i = found = 0; !found && s[i]; i++)
1306 { 1443 {
1307 if (!strcmp (s[i], "OverTheSpot")) 1444 if (!strcmp (s[i], "OverTheSpot"))
1308 input_style = (XIMPreeditPosition | XIMStatusNothing); 1445 input_style = XIMPreeditPosition | XIMStatusNothing;
1309 else if (!strcmp (s[i], "OffTheSpot")) 1446 else if (!strcmp (s[i], "OffTheSpot"))
1310 input_style = (XIMPreeditArea | XIMStatusArea); 1447 input_style = XIMPreeditArea | XIMStatusArea;
1311 else if (!strcmp (s[i], "Root")) 1448 else if (!strcmp (s[i], "Root"))
1312 input_style = (XIMPreeditNothing | XIMStatusNothing); 1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1313 else if (!strcmp (s[i], "None")) 1450 else if (!strcmp (s[i], "None"))
1314 input_style = (XIMPreeditNone | XIMStatusNone); 1451 input_style = XIMPreeditNone | XIMStatusNone;
1452#ifdef ENABLE_XIM_ONTHESPOT
1453 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1454 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1455#endif
1456 else
1457 input_style = XIMPreeditNothing | XIMStatusNothing;
1315 1458
1316 for (j = 0; j < xim_styles->count_styles; j++) 1459 for (j = 0; j < xim_styles->count_styles; j++)
1317 if (input_style == xim_styles->supported_styles[j]) 1460 if (input_style == xim_styles->supported_styles[j])
1318 { 1461 {
1319 rxvt_freecommastring (s); 1462 rxvt_freecommastring (s);
… …
1357 "*", 1500 "*",
1358 fheight, 1501 fheight,
1359 fheight + 1, fheight - 1, 1502 fheight + 1, fheight - 1,
1360 fheight - 2, fheight + 2); 1503 fheight - 2, fheight + 2);
1361 1504
1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1505 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1363 &missing_charset_list, &missing_charset_count, &def_string); 1506 &missing_charset_list, &missing_charset_count, &def_string);
1364 1507
1365 if (missing_charset_list) 1508 if (missing_charset_list)
1366 XFreeStringList (missing_charset_list); 1509 XFreeStringList (missing_charset_list);
1367 1510
… …
1408 XNBackground, bg, 1551 XNBackground, bg,
1409 XNArea, &status_rect, 1552 XNArea, &status_rect,
1410 XNFontSet, fs, 1553 XNFontSet, fs,
1411 NULL); 1554 NULL);
1412 } 1555 }
1556#if ENABLE_XIM_ONTHESPOT
1557 else if (input_style & XIMPreeditCallbacks)
1558 {
1559 im_set_position (spot);
1560
1561 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1562 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1563 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1564# if 0
1565 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1566# endif
1567
1568 preedit_attr = XVaCreateNestedList (0,
1569 XNSpotLocation, &spot,
1570 XNPreeditStartCallback, &xcb[0],
1571 XNPreeditDoneCallback , &xcb[1],
1572 XNPreeditDrawCallback , &xcb[2],
1573# if 0
1574 XNPreeditCaretCallback, &xcb[3],
1575# endif
1576 NULL);
1577 }
1578#endif
1413 1579
1414 Input_Context = XCreateIC (xim, 1580 Input_Context = XCreateIC (xim,
1415 XNInputStyle, input_style, 1581 XNInputStyle, input_style,
1416 XNClientWindow, vt, 1582 XNClientWindow, vt,
1417 XNFocusWindow, parent[0], 1583 XNFocusWindow, parent[0],
… …
1419 preedit_attr, 1585 preedit_attr,
1420 status_attr ? XNStatusAttributes : NULL, 1586 status_attr ? XNStatusAttributes : NULL,
1421 status_attr, NULL); 1587 status_attr, NULL);
1422 1588
1423 if (preedit_attr) XFree (preedit_attr); 1589 if (preedit_attr) XFree (preedit_attr);
1424 if (status_attr) XFree (status_attr); 1590 if (status_attr) XFree (status_attr);
1425 if (fs) XFreeFontSet (display->display, fs); 1591 if (fs) XFreeFontSet (dpy, fs);
1426 1592
1427 if (Input_Context == NULL) 1593 if (Input_Context == NULL)
1428 { 1594 {
1429 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1595 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1430 im_destroy (); 1596 im_destroy ();
1431 return false; 1597 return false;
1432 } 1598 }
1433 1599
1434 if (input_style & XIMPreeditArea) 1600#if 0
1601 // unfortunately, only the focus window is used by XIM, hard to fix
1602 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1603 vt_select_input ();
1604#endif
1605
1435 IMSetStatusPosition (); 1606 IMSetPosition ();
1436 1607
1437 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1438 return true; 1608 return true;
1439} 1609}
1440 1610
1441void 1611void
1442rxvt_term::im_cb () 1612rxvt_term::im_cb ()
… …
1448 1618
1449 make_current (); 1619 make_current ();
1450 1620
1451 im_destroy (); 1621 im_destroy ();
1452 1622
1453 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1454 if (Input_Context) 1623 if (Input_Context)
1455 return; 1624 return;
1456 1625
1457#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1458 if (rs[Rs_imLocale]) 1627 if (rs[Rs_imLocale])
… …
1500 SET_LOCALE (locale); 1669 SET_LOCALE (locale);
1501#endif 1670#endif
1502} 1671}
1503 1672
1504void 1673void
1505rxvt_term::IMSetStatusPosition () 1674rxvt_term::IMSetPosition ()
1506{ 1675{
1507 XRectangle preedit_rect, status_rect, *needed_rect; 1676 XRectangle preedit_rect, status_rect, *needed_rect;
1508 XVaNestedList preedit_attr, status_attr; 1677 XVaNestedList preedit_attr, status_attr;
1509 1678
1510 if (!Input_Context 1679 if (!Input_Context
1511 || !focus 1680 || !focus
1512 || !(input_style & XIMPreeditArea) 1681 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1513 || !IMisRunning ()) 1682 || !IMisRunning ())
1514 return; 1683 return;
1515 1684
1685 if (input_style & XIMPreeditPosition)
1686 {
1687 im_set_size (preedit_rect);
1688 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1689
1690 XSetICValues (Input_Context,
1691 XNPreeditAttributes, preedit_attr, NULL);
1692 }
1693 else
1694 {
1516 /* Getting the necessary width of preedit area */ 1695 /* Getting the necessary width of preedit area */
1517 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1518 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1697 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1519 XFree (status_attr); 1698 XFree (status_attr);
1520 1699
1521 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1700 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1522 XFree (needed_rect); 1701 XFree (needed_rect);
1523 1702
1524 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1703 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1525 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1704 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1526 1705
1527 XSetICValues (Input_Context, 1706 XSetICValues (Input_Context,
1528 XNPreeditAttributes, preedit_attr, 1707 XNPreeditAttributes, preedit_attr,
1529 XNStatusAttributes, status_attr, NULL); 1708 XNStatusAttributes, status_attr,
1709 NULL);
1530 1710
1711 XFree (status_attr);
1712 }
1713
1531 XFree (preedit_attr); 1714 XFree (preedit_attr);
1532 XFree (status_attr);
1533} 1715}
1534#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1717
1718void
1719rxvt_term::get_window_origin (int &x, int &y)
1720{
1721 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724}
1725
1726Pixmap
1727rxvt_term::get_pixmap_property (int prop_id)
1728{
1729 if (prop_id > 0 && prop_id < NUM_XA)
1730 if (xa[prop_id])
1731 {
1732 int aformat;
1733 unsigned long nitems, bytes_after;
1734 Atom atype;
1735 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop;
1742 }
1743 }
1744 return None;
1745}
1746
1747#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756
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 */
1535 1787
1536/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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