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.212 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.312 by root, Tue Nov 4 16:41:12 2008 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;
592
696 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 594 window_vt_x += sb_w;
698 } 595 }
699 596
700 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
704 601
705 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 603 {
707 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
722 { 619 {
723 min_it (height, max_height); 620 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
725 } 622 }
726 623
727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w;
729
730 if (recalc_x) 624 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 626
733 if (recalc_y) 627 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 629
736 ncol = width / fwidth; 630 ncol = width / fwidth;
737 nrow = height / fheight; 631 nrow = height / fheight;
738} 632}
739 633
740/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
741/* 635/*
… …
755 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
756 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
758 652
759#if 0 653#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
763#endif 657#endif
764} 658}
765 659
… …
794 delete fontset[0]; 688 delete fontset[0];
795 fontset[0] = fs; 689 fontset[0] = fs;
796 690
797 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 692 prop.height += lineSpace;
693
799 fs->set_prop (prop); 694 fs->set_prop (prop, false);
800 695
801 fwidth = prop.width; 696 fwidth = prop.width;
802 fheight = prop.height; 697 fheight = prop.height;
803 fbase = prop.ascent; 698 fbase = prop.ascent;
804 699
… …
813 { 708 {
814 fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
816 711
817 if (res) 712 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
819 else 717 else
820 { 718 {
821 res = fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
822 720
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 721 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 722 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
723
724 fs->set_prop (prop2, true);
825 } 725 }
826 726
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 727 }
830#else 728#else
831 fontset[style] = fontset[0]; 729 fontset[style] = fontset[0];
832#endif 730#endif
833 } 731 }
… …
835 if (parent[0]) 733 if (parent[0])
836 { 734 {
837 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 736 scr_remap_chars ();
839 scr_touch (true); 737 scr_touch (true);
840 } 738 }
841 739
842 return true; 740 return true;
843} 741}
844 742
743void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 745{
847 XChangeProperty (xdisp, parent[0], 746 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 749}
851 750
751void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 753{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
856 756
857 XChangeProperty (xdisp, parent[0], 757 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 759 (const unsigned char *)s, strlen (s));
860 760
861 free (s); 761 free (s);
862 free (ws); 762 free (ws);
… …
881#if ENABLE_EWMH 781#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 783#endif
884} 784}
885 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
886#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 790 rxvt_color xcol;
891 int i; 791
892
893 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
894 return; 793 return;
895 794
896 color = strdup (color); 795 color = strdup (color);
897 allocated.push_back ((void *)color); 796 allocated.push_back ((void *)color);
898 rs[Rs_color + idx] = color; 797 rs[Rs_color + idx] = color;
899 798
900 /* handle color aliases */ 799 /* handle color aliases */
901 if (isdigit (*color)) 800 if (isdigit (*color))
902 { 801 {
903 i = atoi (color); 802 int i = atoi (color);
904 803
905 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
906 { /* bright colors */ 806 /* bright colors */
907 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909 goto done; 808 goto done;
910 } 809 }
911 810
912 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
913 { /* normal colors */ 813 /* normal colors */
914 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
915 goto done; 815 goto done;
916 } 816 }
917 } 817 }
918 818
… …
923 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
924 */ 824 */
925 825
926 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
927 827
928 /* XSetWindowAttributes attr; */
929 /* Cursor cursor; */
930done: 828done:
931
932#if OFF_FOCUS_FADING
933 if (rs[Rs_fade])
934 {
935 rgba c;
936 pix_colors [Color_fade].get (this, c);
937 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
938 }
939#endif
940
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
942 830
831 update_fade_color (idx);
943 recolour_cursor (); 832 recolour_cursor ();
944 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
945} 835}
946
947#else
948# define set_window_color (idx,color) ((void)0)
949#endif /* XTERM_COLOR_CHANGE */
950 836
951void 837void
952rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
953{ 839{
954 XColor xcol[2]; 840 XColor fg, bg;
955 841
956 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 842 (ISSET_PIXCOLOR (Color_pointer_fg)
957 ? pix_colors_focused[Color_pointer_fg] 843 ? pix_colors_focused[Color_pointer_fg]
958 : pix_colors_focused[Color_fg]; 844 : pix_colors_focused[Color_fg]).get (fg);
845
959 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 846 (ISSET_PIXCOLOR (Color_pointer_bg)
960 ? pix_colors_focused[Color_pointer_bg] 847 ? pix_colors_focused[Color_pointer_bg]
961 : pix_colors_focused[Color_bg]; 848 : pix_colors_focused[Color_bg]).get (bg);
962 849
963 XQueryColors (xdisp, cmap, xcol, 2);
964 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 850 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
965} 851}
966 852
967/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
968/* 854/*
969 * find if fg/bg matches any of the normal (low-intensity) colors 855 * find if fg/bg matches any of the normal (low-intensity) colors
970 */ 856 */
971void 857void
972rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
973{ 859{
974 unsigned int i; 860 unsigned int i;
975 const char *xpmb = "\0"; 861 const char *xpmb = "";
976 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
977 863
978 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
979 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
980 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
… …
986 872
987 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
988 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
989 { 875 {
990 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
991#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
992 xpmb = "default;"; 878 xpmb = "default;";
993#endif 879#endif
994 break; 880 break;
995 } 881 }
996 882
… …
1005 if (color.set (this, name)) 891 if (color.set (this, name))
1006 return true; 892 return true;
1007 893
1008 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 894 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1009 return false; 895 return false;
896}
897
898void
899rxvt_term::alias_color (int dst, int src)
900{
901 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1010} 902}
1011 903
1012/* -------------------------------------------------------------------- * 904/* -------------------------------------------------------------------- *
1013 * - WINDOW RESIZING - * 905 * - WINDOW RESIZING - *
1014 * -------------------------------------------------------------------- */ 906 * -------------------------------------------------------------------- */
… …
1018 int fix_screen; 910 int fix_screen;
1019 int old_width = szHint.width; 911 int old_width = szHint.width;
1020 int old_height = szHint.height; 912 int old_height = szHint.height;
1021 913
1022 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
915
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 if (set_hint)
919 {
920 szHint.flags &= ~(PBaseSize | PResizeInc);
1023 XSetWMNormalHints (xdisp, parent[0], &szHint); 921 XSetWMNormalHints (dpy, parent[0], &szHint);
922 szHint.flags |= PBaseSize | PResizeInc;
923 }
1024 924
1025 if (!ignoreparent) 925 if (!ignoreparent)
1026 { 926 {
1027#ifdef SMART_RESIZE 927#ifdef SMART_RESIZE
1028 /* 928 /*
… …
1032 int x, y, x1, y1; 932 int x, y, x1, y1;
1033 int dx, dy; 933 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 934 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 935 Window unused_cr;
1036 936
1037 XTranslateCoordinates (xdisp, parent[0], display->root, 937 XTranslateCoordinates (dpy, parent[0], display->root,
1038 0, 0, &x, &y, &unused_cr); 938 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 939 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 940 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 941 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 942 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 943 * our position for handles and decorations. Counter it
1044 */ 944 */
… …
1046 { 946 {
1047 x -= x1; 947 x -= x1;
1048 y -= y1; 948 y -= y1;
1049 } 949 }
1050 950
1051 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 951 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1052 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 952 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1053 dx = old_width - szHint.width; 953 dx = old_width - szHint.width;
1054 dy = old_height - szHint.height; 954 dy = old_height - szHint.height;
1055 955
1056 /* Check position of the center of the window */ 956 /* Check position of the center of the window */
1057 if (x < x1) /* left half */ 957 if (x < x1) /* left half */
… …
1061 if (y < y1) /* top half */ 961 if (y < y1) /* top half */
1062 dy = 0; 962 dy = 0;
1063 else if (y == y1) /* exact center */ 963 else if (y == y1) /* exact center */
1064 dy /= 2; 964 dy /= 2;
1065 965
1066 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 966 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1067 szHint.width, szHint.height); 967 szHint.width, szHint.height);
1068#else 968#else
1069 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 969 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1070#endif 970#endif
1071 } 971 }
1072 972
1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 973 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1074 974
1075 if (fix_screen || newwidth != old_width || newheight != old_height) 975 if (fix_screen || newwidth != old_width || newheight != old_height)
1076 { 976 {
1077 if (scrollBar.state) 977 if (scrollBar.state)
1078 { 978 scrollBar.resize ();
1079 XMoveResizeWindow (xdisp, scrollBar.win,
1080 window_sb_x, 0,
1081 scrollbar_TotalWidth (), szHint.height);
1082 resize_scrollbar ();
1083 }
1084 979
1085 XMoveResizeWindow (xdisp, vt, 980 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 981 window_vt_x, window_vt_y,
1087 width, height); 982 width, height);
1088 983
984#ifdef HAVE_BG_PIXMAP
985 if (bgPixmap.window_size_sensitive ())
986 update_background ();
987#endif
988
1089 scr_clear (); 989 scr_clear ();
1090#ifdef XPM_BACKGROUND
1091 resize_pixmap ();
1092#endif
1093 } 990 }
991
992 if (set_hint)
993 XSetWMNormalHints (dpy, parent[0], &szHint);
1094 994
1095 if (fix_screen || old_height == 0) 995 if (fix_screen || old_height == 0)
1096 scr_reset (); 996 scr_reset ();
1097 997
1098#ifdef XPM_BACKGROUND 998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1099 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)
1100 scr_touch (false); 1004// scr_touch (false);
1101#endif 1005#endif
1102 1006
1103#ifdef USE_XIM 1007#ifdef USE_XIM
1104 IMSetStatusPosition (); 1008 IMSetPosition ();
1105#endif 1009#endif
1106} 1010}
1107 1011
1108/* 1012/*
1109 * 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.
… …
1114{ 1018{
1115 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
1116 1020
1117 if (newwidth == 0 || newheight == 0) 1021 if (newwidth == 0 || newheight == 0)
1118 { 1022 {
1119 XGetWindowAttributes (xdisp, display->root, &wattr); 1023 XGetWindowAttributes (dpy, display->root, &wattr);
1120 1024
1121 if (newwidth == 0) 1025 if (newwidth == 0)
1122 newwidth = wattr.width - szHint.base_width; 1026 newwidth = wattr.width - szHint.base_width;
1123 if (newheight == 0) 1027 if (newheight == 0)
1124 newheight = wattr.height - szHint.base_height; 1028 newheight = wattr.height - szHint.base_height;
… …
1138#ifdef USE_XIM 1042#ifdef USE_XIM
1139 1043
1140void 1044void
1141rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1045rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1142{ 1046{
1143 fg = pix_colors[Color_fg]; 1047 fg = pix_colors [Color_fg];
1144 bg = pix_colors[Color_bg]; 1048 bg = pix_colors [Color_bg];
1145} 1049}
1146 1050
1147void 1051void
1148rxvt_term::im_set_size (XRectangle &size) 1052rxvt_term::im_set_size (XRectangle &size)
1149{ 1053{
… …
1186 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1090 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1187 1091
1188 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1092 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1189 *p = '\0'; 1093 *p = '\0';
1190 1094
1191 atom = XInternAtom (xdisp, server, False); 1095 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (xdisp, atom); 1096 win = XGetSelectionOwner (dpy, atom);
1193 1097
1194 if (win != None) 1098 if (win != None)
1195 return True; 1099 return True;
1196 } 1100 }
1197 1101
… …
1276 if (term->rs[Rs_imLocale]) 1180 if (term->rs[Rs_imLocale])
1277 SET_LOCALE (term->locale); 1181 SET_LOCALE (term->locale);
1278 } 1182 }
1279 else 1183 else
1280 str = (void *)text->string.wide_char; 1184 str = (void *)text->string.wide_char;
1281 1185
1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1186 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1283 DT_INT, call_data->caret, 1187 DT_INT, call_data->caret,
1284 DT_INT, call_data->chg_first, 1188 DT_INT, call_data->chg_first,
1285 DT_INT, call_data->chg_length, 1189 DT_INT, call_data->chg_length,
1286 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1190 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1421 "*", 1325 "*",
1422 fheight, 1326 fheight,
1423 fheight + 1, fheight - 1, 1327 fheight + 1, fheight - 1,
1424 fheight - 2, fheight + 2); 1328 fheight - 2, fheight + 2);
1425 1329
1426 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1330 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1427 &missing_charset_list, &missing_charset_count, &def_string); 1331 &missing_charset_list, &missing_charset_count, &def_string);
1428 1332
1429 if (missing_charset_list) 1333 if (missing_charset_list)
1430 XFreeStringList (missing_charset_list); 1334 XFreeStringList (missing_charset_list);
1431 1335
… …
1506 preedit_attr, 1410 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1411 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1412 status_attr, NULL);
1509 1413
1510 if (preedit_attr) XFree (preedit_attr); 1414 if (preedit_attr) XFree (preedit_attr);
1511 if (status_attr) XFree (status_attr); 1415 if (status_attr) XFree (status_attr);
1512 if (fs) XFreeFontSet (xdisp, fs); 1416 if (fs) XFreeFontSet (dpy, fs);
1513 1417
1514 if (Input_Context == NULL) 1418 if (Input_Context == NULL)
1515 { 1419 {
1516 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1420 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1517 im_destroy (); 1421 im_destroy ();
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1426 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1427 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1428 vt_select_input ();
1525#endif 1429#endif
1526 1430
1527 if (input_style & XIMPreeditArea)
1528 IMSetStatusPosition (); 1431 IMSetPosition ();
1529 1432
1530 return true; 1433 return true;
1531} 1434}
1532 1435
1533void 1436void
… …
1591 SET_LOCALE (locale); 1494 SET_LOCALE (locale);
1592#endif 1495#endif
1593} 1496}
1594 1497
1595void 1498void
1596rxvt_term::IMSetStatusPosition () 1499rxvt_term::IMSetPosition ()
1597{ 1500{
1598 XRectangle preedit_rect, status_rect, *needed_rect; 1501 XRectangle preedit_rect, status_rect, *needed_rect;
1599 XVaNestedList preedit_attr, status_attr; 1502 XVaNestedList preedit_attr, status_attr;
1600 1503
1601 if (!Input_Context 1504 if (!Input_Context
1602 || !focus 1505 || !focus
1603 || !(input_style & XIMPreeditArea) 1506 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1604 || !IMisRunning ()) 1507 || !IMisRunning ())
1605 return; 1508 return;
1606 1509
1510 if (input_style & XIMPreeditPosition)
1511 {
1512 im_set_size (preedit_rect);
1513 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1514
1515 XSetICValues (Input_Context,
1516 XNPreeditAttributes, preedit_attr, NULL);
1517 }
1518 else
1519 {
1607 /* Getting the necessary width of preedit area */ 1520 /* Getting the necessary width of preedit area */
1608 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1521 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1609 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1522 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1610 XFree (status_attr); 1523 XFree (status_attr);
1611 1524
1612 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1525 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1613 XFree (needed_rect); 1526 XFree (needed_rect);
1614 1527
1615 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1528 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1616 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1529 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1617 1530
1618 XSetICValues (Input_Context, 1531 XSetICValues (Input_Context,
1619 XNPreeditAttributes, preedit_attr, 1532 XNPreeditAttributes, preedit_attr,
1620 XNStatusAttributes, status_attr, NULL); 1533 XNStatusAttributes, status_attr,
1534 NULL);
1621 1535
1536 XFree (status_attr);
1537 }
1538
1622 XFree (preedit_attr); 1539 XFree (preedit_attr);
1623 XFree (status_attr);
1624} 1540}
1625#endif /* USE_XIM */ 1541#endif /* USE_XIM */
1542
1543void
1544rxvt_term::get_window_origin (int &x, int &y)
1545{
1546 Window cr;
1547 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1548/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1549}
1550
1551Pixmap
1552rxvt_term::get_pixmap_property (int prop_id)
1553{
1554 if (prop_id > 0 && prop_id < NUM_XA)
1555 if (xa[prop_id])
1556 {
1557 int aformat;
1558 unsigned long nitems, bytes_after;
1559 Atom atype;
1560 unsigned char *prop = NULL;
1561 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1562 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1563 &nitems, &bytes_after, &prop);
1564 if (result == Success && prop && atype == XA_PIXMAP)
1565 return *(Pixmap *)prop;
1566 }
1567
1568 return None;
1569}
1570
1571#ifdef HAVE_BG_PIXMAP
1572# if TRACE_PIXMAPS
1573# undef update_background
1574void
1575rxvt_term::trace_update_background (const char *file, int line)
1576{
1577 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1578 update_background ();
1579}
1580# endif
1581
1582void
1583rxvt_term::update_background ()
1584{
1585 if (update_background_ev.is_active ())
1586 return;
1587
1588 bgPixmap.invalidate ();
1589
1590 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1591
1592 if (to_wait <= 0.)
1593 bgPixmap.render ();
1594 else
1595 update_background_ev.start (to_wait);
1596}
1597
1598void
1599rxvt_term::update_background_cb (ev::timer &w, int revents)
1600{
1601 make_current ();
1602
1603 update_background_ev.stop ();
1604 bgPixmap.render ();
1605 refresh_check ();
1606}
1607
1608#endif /* HAVE_BG_PIXMAP */
1626 1609
1627/*----------------------- end-of-file (C source) -----------------------*/ 1610/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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