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.209 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.304 by ayin, Wed Feb 6 12:05:35 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
219 if (display) 233 if (display)
220 { 234 {
221 selection_clear (); 235 selection_clear ();
222 236
223#ifdef USE_XIM 237#ifdef USE_XIM
224 im_destroy (); 238 im_destroy ();
225#endif 239#endif
226#ifdef XTERM_SCROLLBAR 240#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 243#endif
230#ifdef PLAIN_SCROLLBAR 244#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 246#endif
233#ifdef NEXT_SCROLLBAR 247#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 248 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 249 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 250 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 251 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 252 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 253 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 254 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 255 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 258#endif
245#ifdef RXVT_SCROLLBAR 259#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 263#endif
250 if (gc) XFreeGC (xdisp, gc); 264 if (gc) XFreeGC (dpy, gc);
251 265
252 delete drawable; 266 delete drawable;
253 // destroy all windows 267 // destroy all windows
254 if (parent[0]) 268 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 269 XDestroyWindow (dpy, parent[0]);
270
271 for (int i = 0; i < TOTAL_COLORS; i++)
272 if (ISSET_PIXCOLOR (i))
273 {
274 pix_colors_focused [i].free (this);
275#if OFF_FOCUS_FADING
276 pix_colors_unfocused [i].free (this);
277#endif
278 }
256 279
257 clear (); 280 clear ();
258 }
259 281
260 // TODO: free pixcolours, colours should become part of rxvt_display 282 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); 283 displays.put (display);
284 }
267 285
268 scr_release (); 286 scr_release ();
269 287
270 /* clear all resources */ 288 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
… …
283 delete argv; 301 delete argv;
284 302
285#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
286 delete keyboard; 304 delete keyboard;
287#endif 305#endif
306#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db);
308#endif
288} 309}
289 310
290// child has exited, usually destroys 311// child has exited, usually destroys
291void 312void
292rxvt_term::child_cb (child_watcher &w, int status) 313rxvt_term::child_cb (ev::child &w, int status)
293{ 314{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 315 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 316
296 cmd_pid = 0; 317 cmd_pid = 0;
297 318
298 if (!OPTION (Opt_hold)) 319 if (!option (Opt_hold))
299 destroy (); 320 destroy ();
300} 321}
301 322
302void 323void
303rxvt_term::destroy () 324rxvt_term::destroy ()
304{ 325{
305 if (destroy_ev.active) 326 if (destroy_ev.is_active ())
306 return; 327 return;
307 328
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 330
310#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
… …
314 if (display) 335 if (display)
315 { 336 {
316#if USE_XIM 337#if USE_XIM
317 im_ev.stop (display); 338 im_ev.stop (display);
318#endif 339#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
321#endif 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
324#endif 343#endif
325 incr_ev.stop (); 344 incr_ev.stop ();
326 termwin_ev.stop (display); 345 termwin_ev.stop (display);
327 vt_ev.stop (display); 346 vt_ev.stop (display);
328 } 347 }
329 348
330 check_ev.stop (); 349 flush_ev.stop ();
331 pty_ev.stop (); 350 pty_ev.stop ();
332#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
334#endif 353#endif
335#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
… …
343#endif 362#endif
344#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
345 pointer_ev.stop (); 364 pointer_ev.stop ();
346#endif 365#endif
347 366
348 destroy_ev.start (0); 367 destroy_ev.start ();
349} 368}
350 369
351void 370void
352rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 372{
354 make_current (); 373 make_current ();
355 374
356 delete this; 375 delete this;
357} 376}
… …
411 else 430 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 432 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 434 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 436 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 438}
420#endif 439#endif
421 440
… …
445 DisplayString (display)); 464 DisplayString (display));
446 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
448} 467}
449 468
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 469static struct sig_handlers
531{ 470{
532 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
533 472
534 /* 473 /*
535 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
536 */ 475 */
537 void 476 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 477
478 sig_handlers ()
539 { 479 {
540 rxvt_emergency_cleanup (); 480 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) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 482 }
550} sig_handlers; 483} sig_handlers;
551 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
552char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
553 494
554void 495void
555rxvt_init () 496rxvt_init ()
556{ 497{
557 ptytty::init (); 498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 502
559 rxvt_environ = environ; 503 rxvt_environ = environ;
560 504
561 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
563 507
564 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 510
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
569 513
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
572 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
573 517
574 XrmInitialize (); 518 XrmInitialize ();
575} 519}
576 520
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/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
614/* 522/*
615 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
617 */ 525 */
618void 526void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 528{
… …
691 599
692 if (scrollBar.state) 600 if (scrollBar.state)
693 { 601 {
694 sb_w = scrollbar_TotalWidth (); 602 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
604
696 if (!OPTION (Opt_scrollBar_right)) 605 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 606 window_vt_x += sb_w;
698 } 607 }
699 608
700 szHint.width_inc = fwidth; 609 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 610 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 611 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 612 szHint.min_height = szHint.base_height + szHint.height_inc;
704 613
705 if (newwidth && newwidth - szHint.base_width < max_width) 614 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 615 {
707 szHint.width = newwidth; 616 szHint.width = newwidth;
… …
722 { 631 {
723 min_it (height, max_height); 632 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 633 szHint.height = szHint.base_height + height;
725 } 634 }
726 635
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 636 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 637 window_sb_x = szHint.width - sb_w;
729 638
730 if (recalc_x) 639 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 641
733 if (recalc_y) 642 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 644
736 ncol = width / fwidth; 645 ncol = width / fwidth;
737 nrow = height / fheight; 646 nrow = height / fheight;
738} 647}
739 648
… …
755 ws.ws_xpixel = width; 664 ws.ws_xpixel = width;
756 ws.ws_ypixel = height; 665 ws.ws_ypixel = height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
758 667
759#if 0 668#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 669 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 670 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 671 kill (-cmd_pid, SIGWINCH);
763#endif 672#endif
764} 673}
765 674
… …
794 delete fontset[0]; 703 delete fontset[0];
795 fontset[0] = fs; 704 fontset[0] = fs;
796 705
797 prop = (*fs)[1]->properties (); 706 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 707 prop.height += lineSpace;
708
799 fs->set_prop (prop); 709 fs->set_prop (prop, false);
800 710
801 fwidth = prop.width; 711 fwidth = prop.width;
802 fheight = prop.height; 712 fheight = prop.height;
803 fbase = prop.ascent; 713 fbase = prop.ascent;
804 714
… …
813 { 723 {
814 fontset[style] = fs = new rxvt_fontset (this); 724 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 725 rxvt_fontprop prop2 = prop;
816 726
817 if (res) 727 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 728 {
729 fs->populate (res);
730 fs->set_prop (prop2, false);
731 }
819 else 732 else
820 { 733 {
821 res = fontset[0]->fontdesc; 734 fs->populate (fontset[0]->fontdesc);
822 735
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 736 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; 737 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
738
739 fs->set_prop (prop2, true);
825 } 740 }
826 741
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 742 }
830#else 743#else
831 fontset[style] = fontset[0]; 744 fontset[style] = fontset[0];
832#endif 745#endif
833 } 746 }
… …
835 if (parent[0]) 748 if (parent[0])
836 { 749 {
837 resize_all_windows (0, 0, 0); 750 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 751 scr_remap_chars ();
839 scr_touch (true); 752 scr_touch (true);
840 } 753 }
841 754
842 return true; 755 return true;
843} 756}
844 757
758void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 759rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 760{
847 XChangeProperty (xdisp, parent[0], 761 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 762 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 763 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 764}
851 765
766void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 767rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 768{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 769 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 770 char *s = rxvt_wcstoutf8 (ws);
856 771
857 XChangeProperty (xdisp, parent[0], 772 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 774 (const unsigned char *)s, strlen (s));
860 775
861 free (s); 776 free (s);
862 free (ws); 777 free (ws);
… …
881#if ENABLE_EWMH 796#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 798#endif
884} 799}
885 800
801void
802rxvt_term::set_window_color (int idx, const char *color)
803{
886#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 805 rxvt_color xcol;
891 int i;
892 806
893 if (color == NULL || *color == '\0') 807 if (color == NULL || *color == '\0')
894 return; 808 return;
895 809
810 color = strdup (color);
811 allocated.push_back ((void *)color);
812 rs[Rs_color + idx] = color;
813
896 /* handle color aliases */ 814 /* handle color aliases */
897 if (isdigit (*color)) 815 if (isdigit (*color))
898 { 816 {
899 i = atoi (color); 817 int i = atoi (color);
900 818
901 if (i >= 8 && i <= 15) 819 if (i >= 8 && i <= 15)
820 {
902 { /* bright colors */ 821 /* bright colors */
903 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 822 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
905 SET_PIXCOLOR (idx);
906 goto done; 823 goto done;
907 } 824 }
908 825
909 if (i >= 0 && i <= 7) 826 if (i >= 0 && i <= 7)
827 {
910 { /* normal colors */ 828 /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 829 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 830 goto done;
914 } 831 }
915 } 832 }
916 833
917 if (!set_color (xcol, color)) 834 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 835
922 /* 836 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 837 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 838 * so just keep gobbling up the colormap
925 */ 839 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 840
938 pix_colors_focused[idx] = xcol; 841 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 842
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 843done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 844 /*TODO: handle Color_BD, scrollbar background, etc. */
951 845
846 update_fade_color (idx);
952 recolour_cursor (); 847 recolour_cursor ();
953 scr_recolour (); 848 scr_recolour ();
849#endif /* XTERM_COLOR_CHANGE */
954} 850}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 851
960void 852void
961rxvt_term::recolour_cursor () 853rxvt_term::recolour_cursor ()
962{ 854{
963 XColor xcol[2]; 855 XColor fg, bg;
964 856
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 857 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 858 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 859 : pix_colors_focused[Color_fg]).get (fg);
860
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 861 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 862 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 863 : pix_colors_focused[Color_bg]).get (bg);
971 864
972 XQueryColors (xdisp, cmap, xcol, 2);
973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 865 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 866}
975 867
976/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
977/* 869/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 870 * find if fg/bg matches any of the normal (low-intensity) colors
979 */ 871 */
980void 872void
981rxvt_term::set_colorfgbg () 873rxvt_term::set_colorfgbg ()
982{ 874{
983 unsigned int i; 875 unsigned int i;
984 const char *xpmb = "\0"; 876 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 877 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986 878
987 strcpy (fstr, "default"); 879 strcpy (fstr, "default");
988 strcpy (bstr, "default"); 880 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 881 for (i = Color_Black; i <= Color_White; i++)
… …
995 887
996 for (i = Color_Black; i <= Color_White; i++) 888 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 889 if (pix_colors[Color_bg] == pix_colors[i])
998 { 890 {
999 sprintf (bstr, "%d", (i - Color_Black)); 891 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 892#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 893 xpmb = "default;";
1002#endif 894#endif
1003 break; 895 break;
1004 } 896 }
1005 897
… …
1014 if (color.set (this, name)) 906 if (color.set (this, name))
1015 return true; 907 return true;
1016 908
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 909 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false; 910 return false;
911}
912
913void
914rxvt_term::alias_color (int dst, int src)
915{
916 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1019} 917}
1020 918
1021/* -------------------------------------------------------------------- * 919/* -------------------------------------------------------------------- *
1022 * - WINDOW RESIZING - * 920 * - WINDOW RESIZING - *
1023 * -------------------------------------------------------------------- */ 921 * -------------------------------------------------------------------- */
… …
1027 int fix_screen; 925 int fix_screen;
1028 int old_width = szHint.width; 926 int old_width = szHint.width;
1029 int old_height = szHint.height; 927 int old_height = szHint.height;
1030 928
1031 window_calc (newwidth, newheight); 929 window_calc (newwidth, newheight);
930
931 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1032 XSetWMNormalHints (xdisp, parent[0], &szHint); 932 XSetWMNormalHints (dpy, parent[0], &szHint);
1033 933
1034 if (!ignoreparent) 934 if (!ignoreparent)
1035 { 935 {
1036#ifdef SMART_RESIZE 936#ifdef SMART_RESIZE
1037 /* 937 /*
… …
1041 int x, y, x1, y1; 941 int x, y, x1, y1;
1042 int dx, dy; 942 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 943 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 944 Window unused_cr;
1045 945
1046 XTranslateCoordinates (xdisp, parent[0], display->root, 946 XTranslateCoordinates (dpy, parent[0], display->root,
1047 0, 0, &x, &y, &unused_cr); 947 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 948 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 949 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 950 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 951 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 952 * our position for handles and decorations. Counter it
1053 */ 953 */
… …
1055 { 955 {
1056 x -= x1; 956 x -= x1;
1057 y -= y1; 957 y -= y1;
1058 } 958 }
1059 959
1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 960 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 961 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1062 dx = old_width - szHint.width; 962 dx = old_width - szHint.width;
1063 dy = old_height - szHint.height; 963 dy = old_height - szHint.height;
1064 964
1065 /* Check position of the center of the window */ 965 /* Check position of the center of the window */
1066 if (x < x1) /* left half */ 966 if (x < x1) /* left half */
… …
1070 if (y < y1) /* top half */ 970 if (y < y1) /* top half */
1071 dy = 0; 971 dy = 0;
1072 else if (y == y1) /* exact center */ 972 else if (y == y1) /* exact center */
1073 dy /= 2; 973 dy /= 2;
1074 974
1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 975 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1076 szHint.width, szHint.height); 976 szHint.width, szHint.height);
1077#else 977#else
1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 978 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1079#endif 979#endif
1080 } 980 }
1081 981
1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 982 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 983
1084 if (fix_screen || newwidth != old_width || newheight != old_height) 984 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 985 {
1086 if (scrollBar.state) 986 if (scrollBar.state)
1087 { 987 {
1088 XMoveResizeWindow (xdisp, scrollBar.win, 988 XMoveResizeWindow (dpy, scrollBar.win,
1089 window_sb_x, 0, 989 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height); 990 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar (); 991 resize_scrollbar ();
1092 } 992 }
1093 993
1094 XMoveResizeWindow (xdisp, vt, 994 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 995 window_vt_x, window_vt_y,
1096 width, height); 996 width, height);
1097 997
998#ifdef HAVE_BG_PIXMAP
999 if (bgPixmap.window_size_sensitive ())
1000 update_background ();
1001#endif
1002
1098 scr_clear (); 1003 scr_clear ();
1099#ifdef XPM_BACKGROUND
1100 resize_pixmap ();
1101#endif
1102 } 1004 }
1103 1005
1104 if (fix_screen || old_height == 0) 1006 if (fix_screen || old_height == 0)
1105 scr_reset (); 1007 scr_reset ();
1106 1008
1107#ifdef XPM_BACKGROUND 1009 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 if (pixmap) 1010 //scr_touch (false);
1011
1012#ifdef HAVE_BG_PIXMAP
1013// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1014// if (bgPixmap.pixmap)
1109 scr_touch (false); 1015// scr_touch (false);
1110#endif 1016#endif
1111 1017
1112#ifdef USE_XIM 1018#ifdef USE_XIM
1113 IMSetStatusPosition (); 1019 IMSetPosition ();
1114#endif 1020#endif
1115} 1021}
1116 1022
1117/* 1023/*
1118 * Set the width/height of the vt window in characters. Units are pixels. 1024 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123{ 1029{
1124 XWindowAttributes wattr; 1030 XWindowAttributes wattr;
1125 1031
1126 if (newwidth == 0 || newheight == 0) 1032 if (newwidth == 0 || newheight == 0)
1127 { 1033 {
1128 XGetWindowAttributes (xdisp, display->root, &wattr); 1034 XGetWindowAttributes (dpy, display->root, &wattr);
1129 1035
1130 if (newwidth == 0) 1036 if (newwidth == 0)
1131 newwidth = wattr.width - szHint.base_width; 1037 newwidth = wattr.width - szHint.base_width;
1132 if (newheight == 0) 1038 if (newheight == 0)
1133 newheight = wattr.height - szHint.base_height; 1039 newheight = wattr.height - szHint.base_height;
… …
1147#ifdef USE_XIM 1053#ifdef USE_XIM
1148 1054
1149void 1055void
1150rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1056rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1151{ 1057{
1152 fg = pix_colors[Color_fg]; 1058 fg = pix_colors [Color_fg];
1153 bg = pix_colors[Color_bg]; 1059 bg = pix_colors [Color_bg];
1154} 1060}
1155 1061
1156void 1062void
1157rxvt_term::im_set_size (XRectangle &size) 1063rxvt_term::im_set_size (XRectangle &size)
1158{ 1064{
… …
1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1196 1102
1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1103 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1198 *p = '\0'; 1104 *p = '\0';
1199 1105
1200 atom = XInternAtom (xdisp, server, False); 1106 atom = XInternAtom (dpy, server, False);
1201 win = XGetSelectionOwner (xdisp, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1202 1108
1203 if (win != None) 1109 if (win != None)
1204 return True; 1110 return True;
1205 } 1111 }
1206 1112
… …
1285 if (term->rs[Rs_imLocale]) 1191 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->locale); 1192 SET_LOCALE (term->locale);
1287 } 1193 }
1288 else 1194 else
1289 str = (void *)text->string.wide_char; 1195 str = (void *)text->string.wide_char;
1290 1196
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret, 1198 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,
1295 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1201 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1430 "*", 1336 "*",
1431 fheight, 1337 fheight,
1432 fheight + 1, fheight - 1, 1338 fheight + 1, fheight - 1,
1433 fheight - 2, fheight + 2); 1339 fheight - 2, fheight + 2);
1434 1340
1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1341 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1436 &missing_charset_list, &missing_charset_count, &def_string); 1342 &missing_charset_list, &missing_charset_count, &def_string);
1437 1343
1438 if (missing_charset_list) 1344 if (missing_charset_list)
1439 XFreeStringList (missing_charset_list); 1345 XFreeStringList (missing_charset_list);
1440 1346
… …
1515 preedit_attr, 1421 preedit_attr,
1516 status_attr ? XNStatusAttributes : NULL, 1422 status_attr ? XNStatusAttributes : NULL,
1517 status_attr, NULL); 1423 status_attr, NULL);
1518 1424
1519 if (preedit_attr) XFree (preedit_attr); 1425 if (preedit_attr) XFree (preedit_attr);
1520 if (status_attr) XFree (status_attr); 1426 if (status_attr) XFree (status_attr);
1521 if (fs) XFreeFontSet (xdisp, fs); 1427 if (fs) XFreeFontSet (dpy, fs);
1522 1428
1523 if (Input_Context == NULL) 1429 if (Input_Context == NULL)
1524 { 1430 {
1525 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1431 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1526 im_destroy (); 1432 im_destroy ();
… …
1531 // unfortunately, only the focus window is used by XIM, hard to fix 1437 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input (); 1439 vt_select_input ();
1534#endif 1440#endif
1535 1441
1536 if (input_style & XIMPreeditArea)
1537 IMSetStatusPosition (); 1442 IMSetPosition ();
1538 1443
1539 return true; 1444 return true;
1540} 1445}
1541 1446
1542void 1447void
… …
1600 SET_LOCALE (locale); 1505 SET_LOCALE (locale);
1601#endif 1506#endif
1602} 1507}
1603 1508
1604void 1509void
1605rxvt_term::IMSetStatusPosition () 1510rxvt_term::IMSetPosition ()
1606{ 1511{
1607 XRectangle preedit_rect, status_rect, *needed_rect; 1512 XRectangle preedit_rect, status_rect, *needed_rect;
1608 XVaNestedList preedit_attr, status_attr; 1513 XVaNestedList preedit_attr, status_attr;
1609 1514
1610 if (!Input_Context 1515 if (!Input_Context
1611 || !focus 1516 || !focus
1612 || !(input_style & XIMPreeditArea) 1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1613 || !IMisRunning ()) 1518 || !IMisRunning ())
1614 return; 1519 return;
1615 1520
1521 if (input_style & XIMPreeditPosition)
1522 {
1523 im_set_size (preedit_rect);
1524 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1525
1526 XSetICValues (Input_Context,
1527 XNPreeditAttributes, preedit_attr, NULL);
1528 }
1529 else
1530 {
1616 /* Getting the necessary width of preedit area */ 1531 /* Getting the necessary width of preedit area */
1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1532 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1533 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1619 XFree (status_attr); 1534 XFree (status_attr);
1620 1535
1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1536 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1622 XFree (needed_rect); 1537 XFree (needed_rect);
1623 1538
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1539 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1540 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1626 1541
1627 XSetICValues (Input_Context, 1542 XSetICValues (Input_Context,
1628 XNPreeditAttributes, preedit_attr, 1543 XNPreeditAttributes, preedit_attr,
1629 XNStatusAttributes, status_attr, NULL); 1544 XNStatusAttributes, status_attr,
1545 NULL);
1630 1546
1547 XFree (status_attr);
1548 }
1549
1631 XFree (preedit_attr); 1550 XFree (preedit_attr);
1632 XFree (status_attr);
1633} 1551}
1634#endif /* USE_XIM */ 1552#endif /* USE_XIM */
1553
1554void
1555rxvt_term::get_window_origin (int &x, int &y)
1556{
1557 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560}
1561
1562Pixmap
1563rxvt_term::get_pixmap_property (int prop_id)
1564{
1565 if (prop_id > 0 && prop_id < NUM_XA)
1566 if (xa[prop_id])
1567 {
1568 int aformat;
1569 unsigned long nitems, bytes_after;
1570 Atom atype;
1571 unsigned char *prop = NULL;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP)
1576 return *(Pixmap *)prop;
1577 }
1578
1579 return None;
1580}
1581
1582#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592
1593void
1594rxvt_term::update_background ()
1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1599 bgPixmap.invalidate ();
1600
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1602
1603 if (to_wait <= 0.)
1604 bgPixmap.render ();
1605 else
1606 update_background_ev.start (to_wait);
1607}
1608
1609void
1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{
1612 make_current ();
1613
1614 update_background_ev.stop ();
1615 bgPixmap.render ();
1616 refresh_check ();
1617}
1618
1619#endif /* HAVE_BG_PIXMAP */
1635 1620
1636/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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