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

Diff Legend

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