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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC

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

Diff Legend

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