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.215 by root, Wed Feb 1 18:36:48 2006 UTC vs.
Revision 1.318 by root, Sat May 30 08:51:23 2009 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 164#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 167#endif
163#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 170#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 180#endif
169#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 183#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 184#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 186#endif
178 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 194
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 196
189 termlist.push_back (this); 197 termlist.push_back (this);
190 198
191#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
212 pty_ev.stop ();
203 delete pty; pty = 0; 213 delete pty; pty = 0;
204} 214}
205 215
206rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
207{ 217{
… …
214 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
215 delete fontset[i]; 225 delete fontset[i];
216#endif 226#endif
217 delete fontset[0]; 227 delete fontset[0];
218 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
219 if (display) 239 if (display)
220 { 240 {
221 selection_clear (); 241 selection_clear ();
222 242
223#ifdef USE_XIM 243#ifdef USE_XIM
224 im_destroy (); 244 im_destroy ();
225#endif 245#endif
226#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif
230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif
233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif
245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif
250 if (gc) XFreeGC (xdisp, gc); 247 if (gc) XFreeGC (dpy, gc);
251 248
252 delete drawable; 249 delete drawable;
253 // destroy all windows 250 // destroy all windows
254 if (parent[0]) 251 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 252 XDestroyWindow (dpy, parent[0]);
253
254 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i))
256 {
257 pix_colors_focused [i].free (this);
258#if OFF_FOCUS_FADING
259 pix_colors_unfocused [i].free (this);
260#endif
261 }
256 262
257 clear (); 263 clear ();
258 }
259 264
260 // TODO: free pixcolours, colours should become part of rxvt_display 265 display->flush (); /* ideally .put should do this */
261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused;
264#endif
265
266 displays.put (display); 266 displays.put (display);
267 }
267 268
268 scr_release (); 269 scr_release ();
269 270
270 /* clear all resources */ 271 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
283 delete argv; 284 delete argv;
284 285
285#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
286 delete keyboard; 287 delete keyboard;
287#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
288} 292}
289 293
290// child has exited, usually destroys 294// child has exited, usually destroys
291void 295void
292rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
293{ 297{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 299
296 cmd_pid = 0; 300 cmd_pid = 0;
297 301
298 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
299 destroy (); 303 destroy ();
300} 304}
301 305
302void 306void
303rxvt_term::destroy () 307rxvt_term::destroy ()
304{ 308{
305 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
306 return; 310 return;
307 311
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 313
310#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
… …
314 if (display) 318 if (display)
315 { 319 {
316#if USE_XIM 320#if USE_XIM
317 im_ev.stop (display); 321 im_ev.stop (display);
318#endif 322#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
321#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
324#endif 326#endif
325 incr_ev.stop (); 327 incr_ev.stop ();
326 termwin_ev.stop (display); 328 termwin_ev.stop (display);
327 vt_ev.stop (display); 329 vt_ev.stop (display);
328 } 330 }
329 331
330 check_ev.stop (); 332 flush_ev.stop ();
331 pty_ev.stop (); 333 pty_ev.stop ();
332#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
334#endif 336#endif
335#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
343#endif 345#endif
344#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
345 pointer_ev.stop (); 347 pointer_ev.stop ();
346#endif 348#endif
347 349
348 destroy_ev.start (0); 350 destroy_ev.start ();
349} 351}
350 352
351void 353void
352rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 355{
354 make_current (); 356 make_current ();
355 357
356 delete this; 358 delete this;
357} 359}
… …
411 else 413 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 415 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 417 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 419 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 421}
420#endif 422#endif
421 423
… …
445 DisplayString (display)); 447 DisplayString (display));
446 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
448} 450}
449 451
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 init_xlocale ();
481
482 scr_reset (); // initialize screen
483
484#if 0
485 XSynchronize (xdisp, True);
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */
491#endif
492#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent))
494 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root);
498 }
499#endif
500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
527 return true;
528}
529
530static struct sig_handlers 452static struct sig_handlers
531{ 453{
532 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
533 455
534 /* 456 /*
535 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
536 */ 458 */
537 void 459 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 460
461 sig_handlers ()
539 { 462 {
540 rxvt_emergency_cleanup (); 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
541 signal (w.signum, SIG_DFL);
542 kill (getpid (), w.signum);
543 }
544
545 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 465 }
550} sig_handlers; 466} sig_handlers;
551 467
468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
552char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
553 477
554void 478void
555rxvt_init () 479rxvt_init ()
556{ 480{
557 ptytty::init (); 481 ptytty::init ();
482
483 if (!ev_default_loop (0))
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 485
559 rxvt_environ = environ; 486 rxvt_environ = environ;
560 487
561 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
563 490
564 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 493
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
569 496
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
572 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
573 500
574 XrmInitialize (); 501 XrmInitialize ();
575} 502}
576 503
577/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */
580void *
581rxvt_malloc (size_t size)
582{
583 void *p = malloc (size);
584
585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
588 return p;
589}
590
591void *
592rxvt_calloc (size_t number, size_t size)
593{
594 void *p = calloc (number, size);
595
596 if (!p)
597 rxvt_fatal ("memory allocation failure. aborting.\n");
598
599 return p;
600}
601
602void *
603rxvt_realloc (void *ptr, size_t size)
604{
605 void *p = realloc (ptr, size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
614/* 505/*
615 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
617 */ 508 */
618void 509void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 511{
621 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
622 int x, y, sb_w, flags; 513 int x, y, flags;
623 unsigned int w, h; 514 unsigned int w, h;
624 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
625 516
626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
627 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
637 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
638 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
639 530
640 if (flags & WidthValue) 531 if (flags & WidthValue)
641 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
642 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
643 szHint.flags |= USSize; 537 szHint.flags |= USSize;
644 } 538 }
645 539
646 if (flags & HeightValue) 540 if (flags & HeightValue)
647 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
648 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
649 szHint.flags |= USSize; 546 szHint.flags |= USSize;
650 } 547 }
651 548
652 if (flags & XValue) 549 if (flags & XValue)
653 { 550 {
… …
684 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
685 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
686 583
687 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
688 585
689 sb_w = 0;
690 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
691 587
692 if (scrollBar.state) 588 if (scrollBar.state)
693 { 589 {
694 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
695 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
696 592
697 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 594 window_vt_x += sb_w;
699 } 595 }
700 596
701 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
705 601
706 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 603 {
708 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
723 { 619 {
724 min_it (height, max_height); 620 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
726 } 622 }
727 623
728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w;
730
731 if (recalc_x) 624 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 626
734 if (recalc_y) 627 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 629
737 ncol = width / fwidth; 630 ncol = width / fwidth;
738 nrow = height / fheight; 631 nrow = height / fheight;
739} 632}
740 633
741/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
742/* 635/*
… …
753 646
754 ws.ws_col = ncol; 647 ws.ws_col = ncol;
755 ws.ws_row = nrow; 648 ws.ws_row = nrow;
756 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
757 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
758 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
759 652
760#if 0 653#if 0
761 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
762 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
763 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
764#endif 657#endif
765} 658}
766 659
… …
795 delete fontset[0]; 688 delete fontset[0];
796 fontset[0] = fs; 689 fontset[0] = fs;
797 690
798 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
799 prop.height += lineSpace; 692 prop.height += lineSpace;
693 prop.width += letterSpace;
694
800 fs->set_prop (prop); 695 fs->set_prop (prop, false);
801 696
802 fwidth = prop.width; 697 fwidth = prop.width;
803 fheight = prop.height; 698 fheight = prop.height;
804 fbase = prop.ascent; 699 fbase = prop.ascent;
805 700
… …
814 { 709 {
815 fontset[style] = fs = new rxvt_fontset (this); 710 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 711 rxvt_fontprop prop2 = prop;
817 712
818 if (res) 713 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 714 {
715 fs->populate (res);
716 fs->set_prop (prop2, false);
717 }
820 else 718 else
821 { 719 {
822 res = fontset[0]->fontdesc; 720 fs->populate (fontset[0]->fontdesc);
823 721
824 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 722 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
825 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 723 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
724
725 fs->set_prop (prop2, true);
826 } 726 }
827 727
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 728 }
831#else 729#else
832 fontset[style] = fontset[0]; 730 fontset[style] = fontset[0];
833#endif 731#endif
834 } 732 }
… …
836 if (parent[0]) 734 if (parent[0])
837 { 735 {
838 resize_all_windows (0, 0, 0); 736 resize_all_windows (0, 0, 0);
839 scr_remap_chars (); 737 scr_remap_chars ();
840 scr_touch (true); 738 scr_touch (true);
841 } 739 }
842 740
843 return true; 741 return true;
844} 742}
845 743
744void
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 745rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 746{
848 XChangeProperty (xdisp, parent[0], 747 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 748 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 749 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 750}
852 751
752void
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 753rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 754{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 755 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 756 char *s = rxvt_wcstoutf8 (ws);
857 757
858 XChangeProperty (xdisp, parent[0], 758 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 759 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 760 (const unsigned char *)s, strlen (s));
861 761
862 free (s); 762 free (s);
863 free (ws); 763 free (ws);
… …
882#if ENABLE_EWMH 782#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 783 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 784#endif
885} 785}
886 786
787void
788rxvt_term::set_window_color (int idx, const char *color)
789{
887#ifdef XTERM_COLOR_CHANGE 790#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 791 rxvt_color xcol;
892 int i; 792
893
894 if (color == NULL || *color == '\0') 793 if (color == NULL || *color == '\0')
895 return; 794 return;
896 795
897 color = strdup (color); 796 color = strdup (color);
898 allocated.push_back ((void *)color); 797 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color; 798 rs[Rs_color + idx] = color;
900 799
901 /* handle color aliases */ 800 /* handle color aliases */
902 if (isdigit (*color)) 801 if (isdigit (*color))
903 { 802 {
904 i = atoi (color); 803 int i = atoi (color);
905 804
906 if (i >= 8 && i <= 15) 805 if (i >= 8 && i <= 15)
806 {
907 { /* bright colors */ 807 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 808 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 goto done; 809 goto done;
911 } 810 }
912 811
913 if (i >= 0 && i <= 7) 812 if (i >= 0 && i <= 7)
813 {
914 { /* normal colors */ 814 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 815 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 goto done; 816 goto done;
917 } 817 }
918 } 818 }
919 819
… …
924 * so just keep gobbling up the colormap 824 * so just keep gobbling up the colormap
925 */ 825 */
926 826
927 pix_colors_focused[idx] = xcol; 827 pix_colors_focused[idx] = xcol;
928 828
929 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */
931done: 829done:
932
933#if OFF_FOCUS_FADING
934 if (rs[Rs_fade])
935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
940#endif
941
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 830 /*TODO: handle Color_BD, scrollbar background, etc. */
943 831
832 update_fade_color (idx);
944 recolour_cursor (); 833 recolour_cursor ();
945 scr_recolour (); 834 scr_recolour ();
835#endif /* XTERM_COLOR_CHANGE */
946} 836}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 837
952void 838void
953rxvt_term::recolour_cursor () 839rxvt_term::recolour_cursor ()
954{ 840{
955 XColor fg, bg; 841 XColor fg, bg;
… …
960 846
961 (ISSET_PIXCOLOR (Color_pointer_bg) 847 (ISSET_PIXCOLOR (Color_pointer_bg)
962 ? pix_colors_focused[Color_pointer_bg] 848 ? pix_colors_focused[Color_pointer_bg]
963 : pix_colors_focused[Color_bg]).get (bg); 849 : pix_colors_focused[Color_bg]).get (bg);
964 850
965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 851 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 852}
967 853
968/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
969/* 855/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 856 * find if fg/bg matches any of the normal (low-intensity) colors
971 */ 857 */
972void 858void
973rxvt_term::set_colorfgbg () 859rxvt_term::set_colorfgbg ()
974{ 860{
975 unsigned int i; 861 unsigned int i;
976 const char *xpmb = "\0"; 862 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 863 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 864
979 strcpy (fstr, "default"); 865 strcpy (fstr, "default");
980 strcpy (bstr, "default"); 866 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
… …
987 873
988 for (i = Color_Black; i <= Color_White; i++) 874 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 875 if (pix_colors[Color_bg] == pix_colors[i])
990 { 876 {
991 sprintf (bstr, "%d", (i - Color_Black)); 877 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 878#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 879 xpmb = "default;";
994#endif 880#endif
995 break; 881 break;
996 } 882 }
997 883
… …
1006 if (color.set (this, name)) 892 if (color.set (this, name))
1007 return true; 893 return true;
1008 894
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 895 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 896 return false;
897}
898
899void
900rxvt_term::alias_color (int dst, int src)
901{
902 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 903}
1012 904
1013/* -------------------------------------------------------------------- * 905/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 906 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 907 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 911 int fix_screen;
1020 int old_width = szHint.width; 912 int old_width = szHint.width;
1021 int old_height = szHint.height; 913 int old_height = szHint.height;
1022 914
1023 window_calc (newwidth, newheight); 915 window_calc (newwidth, newheight);
916
917 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
918
919 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
920 if (set_hint)
921 {
922 szHint.flags &= ~(PBaseSize | PResizeInc);
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 923 XSetWMNormalHints (dpy, parent[0], &szHint);
924 szHint.flags |= PBaseSize | PResizeInc;
925 }
1025 926
1026 if (!ignoreparent) 927 if (!ignoreparent)
1027 { 928 {
1028#ifdef SMART_RESIZE 929#ifdef SMART_RESIZE
1029 /* 930 /*
… …
1033 int x, y, x1, y1; 934 int x, y, x1, y1;
1034 int dx, dy; 935 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 936 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 937 Window unused_cr;
1037 938
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 939 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 940 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 941 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 942 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 943 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 944 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 945 * our position for handles and decorations. Counter it
1045 */ 946 */
… …
1047 { 948 {
1048 x -= x1; 949 x -= x1;
1049 y -= y1; 950 y -= y1;
1050 } 951 }
1051 952
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 953 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 954 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 955 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 956 dy = old_height - szHint.height;
1056 957
1057 /* Check position of the center of the window */ 958 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 959 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 963 if (y < y1) /* top half */
1063 dy = 0; 964 dy = 0;
1064 else if (y == y1) /* exact center */ 965 else if (y == y1) /* exact center */
1065 dy /= 2; 966 dy /= 2;
1066 967
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 968 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 969 szHint.width, szHint.height);
1069#else 970#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 971 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 972#endif
1072 } 973 }
974
975 if (set_hint)
976 XSetWMNormalHints (dpy, parent[0], &szHint);
1073 977
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 979
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 981 {
1078 if (scrollBar.state) 982 if (scrollBar.state)
1079 { 983 scrollBar.resize ();
1080 XMoveResizeWindow (xdisp, scrollBar.win,
1081 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar ();
1084 }
1085 984
1086 XMoveResizeWindow (xdisp, vt, 985 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1088 width, height); 987 width, height);
1089 988
1090 scr_clear (); 989#ifdef HAVE_BG_PIXMAP
1091#ifdef XPM_BACKGROUND 990 if (bgPixmap.window_size_sensitive ())
1092 resize_pixmap (); 991 update_background ();
1093#endif 992#endif
1094 } 993 }
1095 994
1096 if (fix_screen || old_height == 0) 995 if (fix_screen || old_height == 0)
1097 scr_reset (); 996 scr_reset ();
1098 997
1099#ifdef XPM_BACKGROUND 998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1100 if (pixmap) 999 //scr_touch (false);
1000
1001#ifdef HAVE_BG_PIXMAP
1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1003// if (bgPixmap.pixmap)
1101 scr_touch (false); 1004// scr_touch (false);
1102#endif 1005#endif
1103 1006
1104#ifdef USE_XIM 1007#ifdef USE_XIM
1105 IMSetStatusPosition (); 1008 IMSetPosition ();
1106#endif 1009#endif
1107} 1010}
1108 1011
1109/* 1012/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1013 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1018{
1116 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
1117 1020
1118 if (newwidth == 0 || newheight == 0) 1021 if (newwidth == 0 || newheight == 0)
1119 { 1022 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1023 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1024
1122 if (newwidth == 0) 1025 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1026 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1027 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1028 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1042#ifdef USE_XIM
1140 1043
1141void 1044void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1045rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1046{
1144 fg = pix_colors[Color_fg]; 1047 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1048 bg = pix_colors [Color_bg];
1146} 1049}
1147 1050
1148void 1051void
1149rxvt_term::im_set_size (XRectangle &size) 1052rxvt_term::im_set_size (XRectangle &size)
1150{ 1053{
… …
1173 1076
1174/* Checking whether input method is running. */ 1077/* Checking whether input method is running. */
1175bool 1078bool
1176rxvt_term::IMisRunning () 1079rxvt_term::IMisRunning ()
1177{ 1080{
1178 char *p;
1179 Atom atom; 1081 Atom atom;
1180 Window win; 1082 Window win;
1181 char server[IMBUFSIZ]; 1083 char server[IMBUFSIZ];
1182 1084
1183 /* get current locale modifier */ 1085 /* get current locale modifier */
1184 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1086 if (char *p = XSetLocaleModifiers (0))
1185 { 1087 {
1186 strcpy (server, "@server="); 1088 strcpy (server, "@server=");
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1089 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1188 1090
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1091 if (p = strchr (server + 1, '@')) /* first one only */
1190 *p = '\0'; 1092 *p = '\0';
1191 1093
1192 atom = XInternAtom (xdisp, server, False); 1094 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1095 win = XGetSelectionOwner (dpy, atom);
1194 1096
1195 if (win != None) 1097 if (win != None)
1196 return True; 1098 return True;
1197 } 1099 }
1198 1100
… …
1277 if (term->rs[Rs_imLocale]) 1179 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale); 1180 SET_LOCALE (term->locale);
1279 } 1181 }
1280 else 1182 else
1281 str = (void *)text->string.wide_char; 1183 str = (void *)text->string.wide_char;
1282 1184
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1185 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret, 1186 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first, 1187 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length, 1188 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1189 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 "*", 1324 "*",
1423 fheight, 1325 fheight,
1424 fheight + 1, fheight - 1, 1326 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1327 fheight - 2, fheight + 2);
1426 1328
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1329 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1330 &missing_charset_list, &missing_charset_count, &def_string);
1429 1331
1430 if (missing_charset_list) 1332 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1333 XFreeStringList (missing_charset_list);
1432 1334
… …
1507 preedit_attr, 1409 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1410 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1411 status_attr, NULL);
1510 1412
1511 if (preedit_attr) XFree (preedit_attr); 1413 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1414 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1415 if (fs) XFreeFontSet (dpy, fs);
1514 1416
1515 if (Input_Context == NULL) 1417 if (Input_Context == NULL)
1516 { 1418 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1419 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1420 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1425 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1426 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1427 vt_select_input ();
1526#endif 1428#endif
1527 1429
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1430 IMSetPosition ();
1530 1431
1531 return true; 1432 return true;
1532} 1433}
1533 1434
1534void 1435void
… …
1592 SET_LOCALE (locale); 1493 SET_LOCALE (locale);
1593#endif 1494#endif
1594} 1495}
1595 1496
1596void 1497void
1597rxvt_term::IMSetStatusPosition () 1498rxvt_term::IMSetPosition ()
1598{ 1499{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1500 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1501 XVaNestedList preedit_attr, status_attr;
1601 1502
1602 if (!Input_Context 1503 if (!Input_Context
1603 || !focus 1504 || !focus
1604 || !(input_style & XIMPreeditArea) 1505 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1506 || !IMisRunning ())
1606 return; 1507 return;
1607 1508
1509 if (input_style & XIMPreeditPosition)
1510 {
1511 im_set_size (preedit_rect);
1512 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1513
1514 XSetICValues (Input_Context,
1515 XNPreeditAttributes, preedit_attr, NULL);
1516 }
1517 else
1518 {
1608 /* Getting the necessary width of preedit area */ 1519 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1520 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1521 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1522 XFree (status_attr);
1612 1523
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1524 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1525 XFree (needed_rect);
1615 1526
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1528 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1529
1619 XSetICValues (Input_Context, 1530 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1531 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1532 XNStatusAttributes, status_attr,
1533 NULL);
1622 1534
1535 XFree (status_attr);
1536 }
1537
1623 XFree (preedit_attr); 1538 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1539}
1626#endif /* USE_XIM */ 1540#endif /* USE_XIM */
1541
1542void
1543rxvt_term::get_window_origin (int &x, int &y)
1544{
1545 Window cr;
1546 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1547/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1548}
1549
1550Pixmap
1551rxvt_term::get_pixmap_property (int prop_id)
1552{
1553 if (prop_id > 0 && prop_id < NUM_XA)
1554 if (xa[prop_id])
1555 {
1556 int aformat;
1557 unsigned long nitems, bytes_after;
1558 Atom atype;
1559 unsigned char *prop = NULL;
1560 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1561 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1562 &nitems, &bytes_after, &prop);
1563 if (result == Success && prop && atype == XA_PIXMAP)
1564 return *(Pixmap *)prop;
1565 }
1566
1567 return None;
1568}
1569
1570#ifdef HAVE_BG_PIXMAP
1571# if TRACE_PIXMAPS
1572# undef update_background
1573void
1574rxvt_term::trace_update_background (const char *file, int line)
1575{
1576 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1577 update_background ();
1578}
1579# endif
1580
1581void
1582rxvt_term::update_background ()
1583{
1584 if (update_background_ev.is_active ())
1585 return;
1586
1587 bgPixmap.invalidate ();
1588
1589 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1590
1591 if (to_wait <= 0.)
1592 bgPixmap.render ();
1593 else
1594 update_background_ev.start (to_wait);
1595}
1596
1597void
1598rxvt_term::update_background_cb (ev::timer &w, int revents)
1599{
1600 make_current ();
1601
1602 update_background_ev.stop ();
1603 bgPixmap.render ();
1604 refresh_check ();
1605}
1606
1607#endif /* HAVE_BG_PIXMAP */
1627 1608
1628/*----------------------- end-of-file (C source) -----------------------*/ 1609/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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