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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 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 dDisp;
222
223 selection_clear (); 241 selection_clear ();
242 selection_clear (true);
224 243
225#ifdef USE_XIM 244#ifdef USE_XIM
226 im_destroy (); 245 im_destroy ();
227#endif 246#endif
228#ifdef XTERM_SCROLLBAR 247 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 248 if (gc) XFreeGC (dpy, gc);
253 249
254 delete drawable; 250 delete drawable;
255 // destroy all windows 251 // destroy all windows
256 if (parent[0]) 252 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 253 XDestroyWindow (dpy, parent[0]);
258 }
259 254
260 // TODO: free pixcolours, colours should become part of rxvt_display 255 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 256 if (ISSET_PIXCOLOR (i))
257 {
258 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 260 pix_colors_unfocused [i].free (this);
264#endif 261#endif
262 }
265 263
264 clear ();
265
266 display->flush (); /* ideally .put should do this */
266 displays.put (display); 267 displays.put (display);
268 }
267 269
268 scr_release (); 270 scr_release ();
269 271
270 /* clear all resources */ 272 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 274 free (allocated [i]);
273 275
274 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 279 free (env_display);
278 free (env_term); 280 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 281 free (locale);
281 free (v_buffer); 282 free (v_buffer);
282 free (incr_buf); 283 free (incr_buf);
283 284
284 delete envv; 285 delete envv;
285 delete argv; 286 delete argv;
286 287
287#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
288 delete keyboard; 289 delete keyboard;
289#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
290} 294}
291 295
292// child has exited, usually destroys 296// child has exited, usually destroys
293void 297void
294rxvt_term::child_cb (child_watcher &w, int status) 298rxvt_term::child_cb (ev::child &w, int status)
295{ 299{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 301
298 cmd_pid = 0; 302 cmd_pid = 0;
299 303
300 if (!OPTION (Opt_hold)) 304 if (!option (Opt_hold))
301 destroy (); 305 destroy ();
302} 306}
303 307
304void 308void
305rxvt_term::destroy () 309rxvt_term::destroy ()
306{ 310{
307 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
308 return; 312 return;
309 313
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 315
312#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
316 if (display) 320 if (display)
317 { 321 {
318#if USE_XIM 322#if USE_XIM
319 im_ev.stop (display); 323 im_ev.stop (display);
320#endif 324#endif
321#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
323#endif 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
324#if TRANSPARENT
325 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
326#endif 328#endif
327 incr_ev.stop (); 329 incr_ev.stop ();
328 termwin_ev.stop (display); 330 termwin_ev.stop (display);
329 vt_ev.stop (display); 331 vt_ev.stop (display);
330 } 332 }
331 333
332 check_ev.stop (); 334 flush_ev.stop ();
333 pty_ev.stop (); 335 pty_ev.stop ();
334#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
336#endif 338#endif
337#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
345#endif 347#endif
346#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
347 pointer_ev.stop (); 349 pointer_ev.stop ();
348#endif 350#endif
349 351
350 destroy_ev.start (0); 352 destroy_ev.start ();
351} 353}
352 354
353void 355void
354rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 357{
356 make_current (); 358 make_current ();
357 359
358 delete this; 360 delete this;
359} 361}
… …
370{ 372{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
373} 375}
374 376
375#if ENABLE_FRILLS 377#if !ENABLE_MINIMAL
376static void 378static void
377print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
378{ 380{
379 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
… …
413 else 415 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 417 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 419 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 421 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 423}
422#endif 424#endif
423 425
… …
428 GET_R->allowedxerror = event->error_code; 430 GET_R->allowedxerror = event->error_code;
429 else 431 else
430 { 432 {
431 // GET_R is most likely not the terminal which caused the error, 433 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 434 // so just output the error and continue
433#if ENABLE_FRILLS 435#if ENABLE_MINIMAL
436 old_xerror_handler (display, event);
437#else
434 print_x_error (display, event); 438 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 439#endif
438 } 440 }
439 441
440 return 0; 442 return 0;
441} 443}
… …
447 DisplayString (display)); 449 DisplayString (display));
448 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
450} 452}
451 453
452/*----------------------------------------------------------------------*/
453bool
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{
456 this->envv = envv;
457
458 SET_R (this);
459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
461
462 if (!init_vars ())
463 return false;
464
465 init_secondary ();
466
467 const char **cmd_argv = init_resources (argc, argv);
468
469#ifdef KEYSYM_RESOURCE
470 keyboard->register_done ();
471#endif
472
473#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */
476#endif
477
478 pty = ptytty::create ();
479
480 create_windows (argc, argv);
481
482 dDisp;
483
484 init_xlocale ();
485
486 scr_reset (); // initialize screen
487
488#if 0
489 XSynchronize (disp, True);
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */
495#endif
496#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent))
498 {
499 XSelectInput (disp, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root);
502 }
503#endif
504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 return true;
532}
533
534static struct sig_handlers 454static struct sig_handlers
535{ 455{
536 sig_watcher sw_term, sw_int; 456 ev::sig sw_term, sw_int;
537 457
538 /* 458 /*
539 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
540 */ 460 */
541 void 461 void sig_term (ev::sig &w, int revents);
542 sig_term (sig_watcher &w) 462
463 sig_handlers ()
543 { 464 {
544 rxvt_emergency_cleanup (); 465 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
552 {
553 } 467 }
554} sig_handlers; 468} sig_handlers;
555 469
470void
471sig_handlers::sig_term (ev::sig &w, int revents)
472{
473 rxvt_emergency_cleanup ();
474 w.stop ();
475 kill (getpid (), w.signum);
476}
477
556char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
557 479
558void 480void
559rxvt_init () 481rxvt_init ()
560{ 482{
561 ptytty::init (); 483 ptytty::init ();
484
485 if (!ev_default_loop (0))
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
562 487
563 rxvt_environ = environ; 488 rxvt_environ = environ;
564 489
565 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
567 492
568 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
569 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
570 495
571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
572 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
573 498
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
576 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
577 502
578 XrmInitialize (); 503 XrmInitialize ();
579} 504}
580 505
581/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */
584void *
585rxvt_malloc (size_t size)
586{
587 void *p = malloc (size);
588
589 if (!p)
590 rxvt_fatal ("memory allocation failure. aborting.\n");
591
592 return p;
593}
594
595void *
596rxvt_calloc (size_t number, size_t size)
597{
598 void *p = calloc (number, size);
599
600 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n");
602
603 return p;
604}
605
606void *
607rxvt_realloc (void *ptr, size_t size)
608{
609 void *p = realloc (ptr, size);
610
611 if (!p)
612 rxvt_fatal ("memory allocation failure. aborting.\n");
613
614 return p;
615}
616
617/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
618/* 507/*
619 * window size/position calculcations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
621 */ 510 */
622void 511void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 513{
625 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 515 int x, y, flags;
627 unsigned int w, h; 516 unsigned int w, h;
628 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
629 dDisp;
630 518
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 521 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 522
… …
642 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
644 532
645 if (flags & WidthValue) 533 if (flags & WidthValue)
646 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
647 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
648 szHint.flags |= USSize; 539 szHint.flags |= USSize;
649 } 540 }
650 541
651 if (flags & HeightValue) 542 if (flags & HeightValue)
652 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
653 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
654 szHint.flags |= USSize; 548 szHint.flags |= USSize;
655 } 549 }
656 550
657 if (flags & XValue) 551 if (flags & XValue)
658 { 552 {
… …
689 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
690 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
691 585
692 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
693 587
694 sb_w = 0;
695 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
696 589
697 if (scrollBar.state) 590 if (scrollBar.state)
698 { 591 {
699 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
700 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
594
701 if (!OPTION (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 596 window_vt_x += sb_w;
703 } 597 }
704 598
705 szHint.width_inc = fwidth; 599 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 600 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 601 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 602 szHint.min_height = szHint.base_height + szHint.height_inc;
709 603
710 if (newwidth && newwidth - szHint.base_width < max_width) 604 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 605 {
712 szHint.width = newwidth; 606 szHint.width = newwidth;
… …
727 { 621 {
728 min_it (height, max_height); 622 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
730 } 624 }
731 625
732 if (scrollBar.state && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w;
734
735 if (recalc_x) 626 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
628
737 if (recalc_y) 629 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 631
740 ncol = width / fwidth; 632 ncol = width / fwidth;
741 nrow = height / fheight; 633 nrow = height / fheight;
742} 634}
743 635
744/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
745/* 637/*
… …
756 648
757 ws.ws_col = ncol; 649 ws.ws_col = ncol;
758 ws.ws_row = nrow; 650 ws.ws_row = nrow;
759 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
760 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
762 654
763#if 0 655#if 0
764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
765 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
766 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
767#endif 659#endif
768} 660}
769 661
… …
798 delete fontset[0]; 690 delete fontset[0];
799 fontset[0] = fs; 691 fontset[0] = fs;
800 692
801 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
802 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
696
803 fs->set_prop (prop); 697 fs->set_prop (prop, false);
804 698
805 fwidth = prop.width; 699 fwidth = prop.width;
806 fheight = prop.height; 700 fheight = prop.height;
807 fbase = prop.ascent; 701 fbase = prop.ascent;
808 702
… …
817 { 711 {
818 fontset[style] = fs = new rxvt_fontset (this); 712 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 713 rxvt_fontprop prop2 = prop;
820 714
821 if (res) 715 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 716 {
717 fs->populate (res);
718 fs->set_prop (prop2, false);
719 }
823 else 720 else
824 { 721 {
825 res = fontset[0]->fontdesc; 722 fs->populate (fontset[0]->fontdesc);
826 723
827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 724 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 725 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
726
727 fs->set_prop (prop2, true);
829 } 728 }
830 729
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 730 }
834#else 731#else
835 fontset[style] = fontset[0]; 732 fontset[style] = fontset[0];
836#endif 733#endif
837 } 734 }
… …
839 if (parent[0]) 736 if (parent[0])
840 { 737 {
841 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
842 scr_remap_chars (); 739 scr_remap_chars ();
843 scr_touch (true); 740 scr_touch (true);
844 } 741 }
845 742
846 return true; 743 return true;
847} 744}
848 745
746void
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 748{
851 XChangeProperty (display->display, parent[0], 749 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 752}
855 753
754void
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 756{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
860 759
861 XChangeProperty (display->display, parent[0], 760 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 762 (const unsigned char *)s, strlen (s));
864 763
865 free (s); 764 free (s);
866 free (ws); 765 free (ws);
… …
885#if ENABLE_EWMH 784#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
887#endif 786#endif
888} 787}
889 788
789void
790rxvt_term::set_window_color (int idx, const char *color)
791{
890#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
891void
892rxvt_term::set_window_color (int idx, const char *color)
893{
894 rxvt_color xcol; 793 rxvt_color xcol;
895 int i;
896 794
897 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
898 return; 796 return;
899 797
798 color = strdup (color);
799 allocated.push_back ((void *)color);
800 rs[Rs_color + idx] = color;
801
900 /* handle color aliases */ 802 /* handle color aliases */
901 if (isdigit (*color)) 803 if (isdigit (*color))
902 { 804 {
903 i = atoi (color); 805 int i = atoi (color);
904 806
905 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
906 { /* bright colors */ 809 /* bright colors */
907 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909 SET_PIXCOLOR (idx);
910 goto done; 811 goto done;
911 } 812 }
912 813
913 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
914 { /* normal colors */ 816 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 818 goto done;
918 } 819 }
919 } 820 }
920 821
921 if (!rXParseAllocColor (&xcol, color)) 822 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 823
926 /* 824 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 825 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
929 */ 827 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 828
942 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 830
945 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */
947done: 831done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
955 833
834 update_fade_color (idx);
956 recolour_cursor (); 835 recolour_cursor ();
957 scr_recolour (); 836 scr_recolour ();
837#endif /* XTERM_COLOR_CHANGE */
958} 838}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 839
964void 840void
965rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
966{ 842{
967 XColor xcol[2]; 843 XColor fg, bg;
968 844
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 845 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 846 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 847 : pix_colors_focused[Color_fg]).get (fg);
848
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 849 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 850 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 851 : pix_colors_focused[Color_bg]).get (bg);
975 852
976 XQueryColors (display->display, display->cmap, xcol, 2); 853 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 854}
979 855
980/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
981/* 857/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 858 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 859 */
984void 860void
985rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
986{ 862{
987 unsigned int i; 863 unsigned int i;
988 const char *xpmb = "\0"; 864 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 866
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 870 if (pix_colors[Color_fg] == pix_colors[i])
996 { 871 {
… …
1000 875
1001 for (i = Color_Black; i <= Color_White; i++) 876 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 877 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 878 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 879 sprintf (bstr, "%d", (i - Color_Black));
1005#ifdef XPM_BACKGROUND 880#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 881 xpmb = "default;";
1007#endif 882#endif
1008 break; 883 break;
1009 } 884 }
1010 885
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 886 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 887}
1013 888
1014/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
1015 890
1016int 891bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 892rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 893{
1019 if (!screen_in_out->set (display, colour)) 894 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 895 return true;
896
897 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
898 return false;
899}
900
901void
902rxvt_term::alias_color (int dst, int src)
903{
904 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1026} 905}
1027 906
1028/* -------------------------------------------------------------------- * 907/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 908 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 909 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 911rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 912{
1034 int fix_screen; 913 int fix_screen;
1035 int old_width = szHint.width; 914 int old_width = szHint.width;
1036 int old_height = szHint.height; 915 int old_height = szHint.height;
1037 dDisp;
1038 916
1039 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
918
919 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
920
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint)
923 {
924 szHint.flags &= ~(PBaseSize | PResizeInc);
1040 XSetWMNormalHints (disp, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1041 928
1042 if (!ignoreparent) 929 if (!ignoreparent)
1043 { 930 {
1044#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1045 /* 932 /*
… …
1049 int x, y, x1, y1; 936 int x, y, x1, y1;
1050 int dx, dy; 937 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 939 Window unused_cr;
1053 940
1054 XTranslateCoordinates (disp, parent[0], display->root, 941 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 942 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 944 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 945 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 946 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 947 * our position for handles and decorations. Counter it
1061 */ 948 */
… …
1063 { 950 {
1064 x -= x1; 951 x -= x1;
1065 y -= y1; 952 y -= y1;
1066 } 953 }
1067 954
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 955 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 956 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 957 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 958 dy = old_height - szHint.height;
1072 959
1073 /* Check position of the center of the window */ 960 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 961 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 965 if (y < y1) /* top half */
1079 dy = 0; 966 dy = 0;
1080 else if (y == y1) /* exact center */ 967 else if (y == y1) /* exact center */
1081 dy /= 2; 968 dy /= 2;
1082 969
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 971 szHint.width, szHint.height);
1085#else 972#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 974#endif
1088 } 975 }
976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
1089 979
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 981
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 983 {
1094 if (scrollBar.state) 984 if (scrollBar.state)
1095 { 985 scrollBar.resize ();
1096 XMoveResizeWindow (disp, scrollBar.win,
1097 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar ();
1100 }
1101 986
1102 XMoveResizeWindow (disp, vt, 987 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1104 width, height); 989 width, height);
1105 990
1106 scr_clear (); 991#ifdef HAVE_BG_PIXMAP
1107#ifdef XPM_BACKGROUND 992 if (bgPixmap.window_size_sensitive ())
1108 resize_pixmap (); 993 update_background ();
1109#endif 994#endif
1110 } 995 }
1111 996
1112 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1113 scr_reset (); 998 scr_reset ();
1114 999
1115#ifdef XPM_BACKGROUND 1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 if (pixmap) 1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1117 scr_touch (false); 1006// scr_touch (false);
1118#endif 1007#endif
1119 1008
1120#ifdef USE_XIM 1009#ifdef USE_XIM
1121 IMSetStatusPosition (); 1010 IMSetPosition ();
1122#endif 1011#endif
1123} 1012}
1124 1013
1125/* 1014/*
1126 * Set the width/height of the vt window in characters. Units are pixels. 1015 * Set the width/height of the vt window in characters. Units are pixels.
… …
1131{ 1020{
1132 XWindowAttributes wattr; 1021 XWindowAttributes wattr;
1133 1022
1134 if (newwidth == 0 || newheight == 0) 1023 if (newwidth == 0 || newheight == 0)
1135 { 1024 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1025 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1026
1138 if (newwidth == 0) 1027 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1028 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1029 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1030 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1044#ifdef USE_XIM
1156 1045
1157void 1046void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1047rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1048{
1160 fg = pix_colors[Color_fg]; 1049 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1050 bg = pix_colors [Color_bg];
1162} 1051}
1163 1052
1164void 1053void
1165rxvt_term::im_set_size (XRectangle &size) 1054rxvt_term::im_set_size (XRectangle &size)
1166{ 1055{
… …
1189 1078
1190/* Checking whether input method is running. */ 1079/* Checking whether input method is running. */
1191bool 1080bool
1192rxvt_term::IMisRunning () 1081rxvt_term::IMisRunning ()
1193{ 1082{
1194 char *p;
1195 Atom atom; 1083 Atom atom;
1196 Window win; 1084 Window win;
1197 char server[IMBUFSIZ]; 1085 char server[IMBUFSIZ];
1198 1086
1199 /* get current locale modifier */ 1087 /* get current locale modifier */
1200 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1088 if (char *p = XSetLocaleModifiers (0))
1201 { 1089 {
1202 strcpy (server, "@server="); 1090 strcpy (server, "@server=");
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1091 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1204 1092
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1093 if (p = strchr (server + 1, '@')) /* first one only */
1206 *p = '\0'; 1094 *p = '\0';
1207 1095
1208 atom = XInternAtom (display->display, server, False); 1096 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1097 win = XGetSelectionOwner (dpy, atom);
1210 1098
1211 if (win != None) 1099 if (win != None)
1212 return True; 1100 return True;
1213 } 1101 }
1214 1102
… …
1293 if (term->rs[Rs_imLocale]) 1181 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale); 1182 SET_LOCALE (term->locale);
1295 } 1183 }
1296 else 1184 else
1297 str = (void *)text->string.wide_char; 1185 str = (void *)text->string.wide_char;
1298 1186
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1187 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret, 1188 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first, 1189 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length, 1190 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1191 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1438 "*", 1326 "*",
1439 fheight, 1327 fheight,
1440 fheight + 1, fheight - 1, 1328 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1329 fheight - 2, fheight + 2);
1442 1330
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1331 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1332 &missing_charset_list, &missing_charset_count, &def_string);
1445 1333
1446 if (missing_charset_list) 1334 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1335 XFreeStringList (missing_charset_list);
1448 1336
… …
1489 XNBackground, bg, 1377 XNBackground, bg,
1490 XNArea, &status_rect, 1378 XNArea, &status_rect,
1491 XNFontSet, fs, 1379 XNFontSet, fs,
1492 NULL); 1380 NULL);
1493 } 1381 }
1382#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1383 else if (input_style & XIMPreeditCallbacks)
1495 { 1384 {
1496 im_set_position (spot); 1385 im_set_position (spot);
1497 1386
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1387 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1388 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1389 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1390# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1391 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1392# endif
1504 1393
1505 preedit_attr = XVaCreateNestedList (0, 1394 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1395 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1396 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1397 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1398 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1399# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1400 XNPreeditCaretCallback, &xcb[3],
1512#endif 1401# endif
1513 NULL); 1402 NULL);
1514 } 1403 }
1404#endif
1515 1405
1516 Input_Context = XCreateIC (xim, 1406 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1407 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1408 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1409 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1411 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1412 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1413 status_attr, NULL);
1524 1414
1525 if (preedit_attr) XFree (preedit_attr); 1415 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1416 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1417 if (fs) XFreeFontSet (dpy, fs);
1528 1418
1529 if (Input_Context == NULL) 1419 if (Input_Context == NULL)
1530 { 1420 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1421 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1422 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1427 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1428 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1429 vt_select_input ();
1540#endif 1430#endif
1541 1431
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1432 IMSetPosition ();
1544 1433
1545 return true; 1434 return true;
1546} 1435}
1547 1436
1548void 1437void
… …
1606 SET_LOCALE (locale); 1495 SET_LOCALE (locale);
1607#endif 1496#endif
1608} 1497}
1609 1498
1610void 1499void
1611rxvt_term::IMSetStatusPosition () 1500rxvt_term::IMSetPosition ()
1612{ 1501{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1502 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1503 XVaNestedList preedit_attr, status_attr;
1615 1504
1616 if (!Input_Context 1505 if (!Input_Context
1617 || !focus 1506 || !focus
1618 || !(input_style & XIMPreeditArea) 1507 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1508 || !IMisRunning ())
1620 return; 1509 return;
1621 1510
1511 if (input_style & XIMPreeditPosition)
1512 {
1513 im_set_size (preedit_rect);
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515
1516 XSetICValues (Input_Context,
1517 XNPreeditAttributes, preedit_attr, NULL);
1518 }
1519 else
1520 {
1622 /* Getting the necessary width of preedit area */ 1521 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1522 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1523 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1524 XFree (status_attr);
1626 1525
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1526 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1527 XFree (needed_rect);
1629 1528
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1529 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1530 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1531
1633 XSetICValues (Input_Context, 1532 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1533 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1534 XNStatusAttributes, status_attr,
1535 NULL);
1636 1536
1537 XFree (status_attr);
1538 }
1539
1637 XFree (preedit_attr); 1540 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1541}
1640#endif /* USE_XIM */ 1542#endif /* USE_XIM */
1543
1544void
1545rxvt_term::get_window_origin (int &x, int &y)
1546{
1547 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550}
1551
1552Pixmap
1553rxvt_term::get_pixmap_property (int prop_id)
1554{
1555 if (prop_id > 0 && prop_id < NUM_XA)
1556 if (xa[prop_id])
1557 {
1558 int aformat;
1559 unsigned long nitems, bytes_after;
1560 Atom atype;
1561 unsigned char *prop = NULL;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP)
1566 return *(Pixmap *)prop;
1567 }
1568
1569 return None;
1570}
1571
1572#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582
1583void
1584rxvt_term::update_background ()
1585{
1586 if (update_background_ev.is_active ())
1587 return;
1588
1589 bgPixmap.invalidate ();
1590
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1592
1593 if (to_wait <= 0.)
1594 bgPixmap.render ();
1595 else
1596 update_background_ev.start (to_wait);
1597}
1598
1599void
1600rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{
1602 make_current ();
1603
1604 update_background_ev.stop ();
1605 bgPixmap.render ();
1606 refresh_check ();
1607}
1608
1609#endif /* HAVE_BG_PIXMAP */
1641 1610
1642/*----------------------- end-of-file (C source) -----------------------*/ 1611/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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