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.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.302 by root, Fri Jan 25 16:04:57 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);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
214 pty_ev.stop ();
203 delete pty; pty = 0; 215 delete pty; pty = 0;
204} 216}
205 217
206rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
207{ 219{
… …
214 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
215 delete fontset[i]; 227 delete fontset[i];
216#endif 228#endif
217 delete fontset[0]; 229 delete fontset[0];
218 230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
234
219 if (display) 235 if (display)
220 { 236 {
221 dDisp;
222
223 selection_clear (); 237 selection_clear ();
224 238
225#ifdef USE_XIM 239#ifdef USE_XIM
226 im_destroy (); 240 im_destroy ();
227#endif 241#endif
228#ifdef XTERM_SCROLLBAR 242#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 245#endif
232#ifdef PLAIN_SCROLLBAR 246#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 248#endif
235#ifdef NEXT_SCROLLBAR 249#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 250 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 251 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 252 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 253 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 254 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 255 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 256 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 257 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 260#endif
247#ifdef RXVT_SCROLLBAR 261#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 265#endif
252 if (gc) XFreeGC (disp, gc); 266 if (gc) XFreeGC (dpy, gc);
253 267
254 delete drawable; 268 delete drawable;
255 // destroy all windows 269 // destroy all windows
256 if (parent[0]) 270 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 271 XDestroyWindow (dpy, parent[0]);
258 }
259 272
260 // TODO: free pixcolours, colours should become part of rxvt_display 273 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 274 if (ISSET_PIXCOLOR (i))
275 {
276 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 277#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 278 pix_colors_unfocused [i].free (this);
264#endif 279#endif
280 }
265 281
282 clear ();
283
284 display->flush (); /* ideally .put should do this */
266 displays.put (display); 285 displays.put (display);
286 }
267 287
268 scr_release (); 288 scr_release ();
269 289
270 /* clear all resources */ 290 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 292 free (allocated [i]);
273 293
274 free (selection.text); 294 free (selection.text);
275 // TODO: manage env vars in child only(!) 295 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 296 free (env_display);
278 free (env_term); 297 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 298 free (locale);
281 free (v_buffer); 299 free (v_buffer);
282 free (incr_buf); 300 free (incr_buf);
283 301
284 delete envv; 302 delete envv;
285 delete argv; 303 delete argv;
286 304
287#ifdef KEYSYM_RESOURCE 305#ifdef KEYSYM_RESOURCE
288 delete keyboard; 306 delete keyboard;
289#endif 307#endif
308#ifndef NO_RESOURCES
309 XrmDestroyDatabase (option_db);
310#endif
290} 311}
291 312
292// child has exited, usually destroys 313// child has exited, usually destroys
293void 314void
294rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
295{ 316{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 318
298 cmd_pid = 0; 319 cmd_pid = 0;
299 320
300 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
301 destroy (); 322 destroy ();
302} 323}
303 324
304void 325void
305rxvt_term::destroy () 326rxvt_term::destroy ()
306{ 327{
307 if (destroy_ev.active) 328 if (destroy_ev.is_active ())
308 return; 329 return;
309 330
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 332
312#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
… …
319 im_ev.stop (display); 340 im_ev.stop (display);
320#endif 341#endif
321#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
323#endif 344#endif
324#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
326#endif 347#endif
327 incr_ev.stop (); 348 incr_ev.stop ();
328 termwin_ev.stop (display); 349 termwin_ev.stop (display);
329 vt_ev.stop (display); 350 vt_ev.stop (display);
330 } 351 }
331 352
332 check_ev.stop (); 353 flush_ev.stop ();
333 pty_ev.stop (); 354 pty_ev.stop ();
334#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
336#endif 357#endif
337#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
345#endif 366#endif
346#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
347 pointer_ev.stop (); 368 pointer_ev.stop ();
348#endif 369#endif
349 370
350 destroy_ev.start (0); 371 destroy_ev.start ();
351} 372}
352 373
353void 374void
354rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 376{
356 make_current (); 377 make_current ();
357 378
358 delete this; 379 delete this;
359} 380}
… …
370{ 391{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 393 (*t)->emergency_cleanup ();
373} 394}
374 395
375#if ENABLE_FRILLS 396#if !ENABLE_MINIMAL
376static void 397static void
377print_x_error (Display *dpy, XErrorEvent *event) 398print_x_error (Display *dpy, XErrorEvent *event)
378{ 399{
379 char buffer[BUFSIZ]; 400 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 401 char mesg[BUFSIZ];
… …
413 else 434 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 436 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 438 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 440 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 442}
422#endif 443#endif
423 444
… …
428 GET_R->allowedxerror = event->error_code; 449 GET_R->allowedxerror = event->error_code;
429 else 450 else
430 { 451 {
431 // GET_R is most likely not the terminal which caused the error, 452 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 453 // so just output the error and continue
433#if ENABLE_FRILLS 454#if ENABLE_MINIMAL
455 old_xerror_handler (display, event);
456#else
434 print_x_error (display, event); 457 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 458#endif
438 } 459 }
439 460
440 return 0; 461 return 0;
441} 462}
… …
447 DisplayString (display)); 468 DisplayString (display));
448 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
450} 471}
451 472
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 XMapWindow (disp, vt);
519 XMapWindow (disp, parent[0]);
520
521 return true;
522}
523
524static struct sig_handlers 473static struct sig_handlers
525{ 474{
526 sig_watcher sw_term, sw_int; 475 ev::sig sw_term, sw_int;
527 476
528 /* 477 /*
529 * Catch a fatal signal and tidy up before quitting 478 * Catch a fatal signal and tidy up before quitting
530 */ 479 */
531 void 480 void sig_term (ev::sig &w, int revents);
532 sig_term (sig_watcher &w) 481
482 sig_handlers ()
533 { 483 {
534 rxvt_emergency_cleanup (); 484 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
535 signal (w.signum, SIG_DFL);
536 kill (getpid (), w.signum);
537 }
538
539 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term),
541 sw_int (this, &sig_handlers::sig_term) 485 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
542 {
543 } 486 }
544} sig_handlers; 487} sig_handlers;
545 488
489void
490sig_handlers::sig_term (ev::sig &w, int revents)
491{
492 rxvt_emergency_cleanup ();
493 w.stop ();
494 kill (getpid (), w.signum);
495}
496
546char **rxvt_environ; // startup environment 497char **rxvt_environ; // startup environment
547 498
548void 499void
549rxvt_init () 500rxvt_init ()
550{ 501{
551 ptytty::init (); 502 ptytty::init ();
503
504 if (!ev_default_loop (0))
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
552 506
553 rxvt_environ = environ; 507 rxvt_environ = environ;
554 508
555 signal (SIGHUP, SIG_IGN); 509 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN); 510 signal (SIGPIPE, SIG_IGN);
557 511
558 sig_handlers.sw_term.start (SIGTERM); 512 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
559 sig_handlers.sw_int.start (SIGINT); 513 sig_handlers.sw_int.start (SIGINT); ev_unref ();
560 514
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */ 516 /* signal (SIGURG, SIG_DFL); */
563 517
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
566 XSetIOErrorHandler (rxvt_xioerror_handler); 520 XSetIOErrorHandler (rxvt_xioerror_handler);
567 521
568 XrmInitialize (); 522 XrmInitialize ();
569} 523}
570 524
571/* ------------------------------------------------------------------------- *
572 * MEMORY ALLOCATION WRAPPERS *
573 * ------------------------------------------------------------------------- */
574void *
575rxvt_malloc (size_t size)
576{
577 void *p = malloc (size);
578
579 if (!p)
580 rxvt_fatal ("memory allocation failure. aborting.\n");
581
582 return p;
583}
584
585void *
586rxvt_calloc (size_t number, size_t size)
587{
588 void *p = calloc (number, size);
589
590 if (!p)
591 rxvt_fatal ("memory allocation failure. aborting.\n");
592
593 return p;
594}
595
596void *
597rxvt_realloc (void *ptr, size_t size)
598{
599 void *p = realloc (ptr, size);
600
601 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n");
603
604 return p;
605}
606
607/*----------------------------------------------------------------------*/ 525/*----------------------------------------------------------------------*/
608/* 526/*
609 * window size/position calculcations for XSizeHint and other storage. 527 * window size/position calculations for XSizeHint and other storage.
610 * if width/height are non-zero then override calculated width/height 528 * if width/height are non-zero then override calculated width/height
611 */ 529 */
612void 530void
613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
614{ 532{
615 short recalc_x, recalc_y; 533 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 534 int x, y, sb_w, flags;
617 unsigned int w, h; 535 unsigned int w, h;
618 unsigned int max_width, max_height; 536 unsigned int max_width, max_height;
619 dDisp;
620 537
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 539 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 540 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 541
… …
686 603
687 if (scrollBar.state) 604 if (scrollBar.state)
688 { 605 {
689 sb_w = scrollbar_TotalWidth (); 606 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 607 szHint.base_width += sb_w;
608
691 if (!OPTION (Opt_scrollBar_right)) 609 if (!option (Opt_scrollBar_right))
692 window_vt_x += sb_w; 610 window_vt_x += sb_w;
693 } 611 }
694 612
695 szHint.width_inc = fwidth; 613 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 614 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
699 617
700 if (newwidth && newwidth - szHint.base_width < max_width) 618 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 619 {
702 szHint.width = newwidth; 620 szHint.width = newwidth;
… …
717 { 635 {
718 min_it (height, max_height); 636 min_it (height, max_height);
719 szHint.height = szHint.base_height + height; 637 szHint.height = szHint.base_height + height;
720 } 638 }
721 639
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 640 if (scrollBar.state && option (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 641 window_sb_x = szHint.width - sb_w;
724 642
725 if (recalc_x) 643 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645
727 if (recalc_y) 646 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 648
730 ncol = width / fwidth; 649 ncol = width / fwidth;
731 nrow = height / fheight; 650 nrow = height / fheight;
732} 651}
733 652
… …
749 ws.ws_xpixel = width; 668 ws.ws_xpixel = width;
750 ws.ws_ypixel = height; 669 ws.ws_ypixel = height;
751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
752 671
753#if 0 672#if 0
754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 673 // TIOCSWINSZ is supposed to do this automatically and correctly
755 if (cmd_pid) /* force through to the command */ 674 if (cmd_pid) /* force through to the command */
756 kill (-cmd_pid, SIGWINCH); 675 kill (-cmd_pid, SIGWINCH);
757#endif 676#endif
758} 677}
759 678
… …
788 delete fontset[0]; 707 delete fontset[0];
789 fontset[0] = fs; 708 fontset[0] = fs;
790 709
791 prop = (*fs)[1]->properties (); 710 prop = (*fs)[1]->properties ();
792 prop.height += lineSpace; 711 prop.height += lineSpace;
712
793 fs->set_prop (prop); 713 fs->set_prop (prop, false);
794 714
795 fwidth = prop.width; 715 fwidth = prop.width;
796 fheight = prop.height; 716 fheight = prop.height;
797 fbase = prop.ascent; 717 fbase = prop.ascent;
798 718
… …
807 { 727 {
808 fontset[style] = fs = new rxvt_fontset (this); 728 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 729 rxvt_fontprop prop2 = prop;
810 730
811 if (res) 731 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 732 {
733 fs->populate (res);
734 fs->set_prop (prop2, false);
735 }
813 else 736 else
814 { 737 {
815 res = fontset[0]->fontdesc; 738 fs->populate (fontset[0]->fontdesc);
816 739
817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 740 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 741 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
742
743 fs->set_prop (prop2, true);
819 } 744 }
820 745
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 746 }
824#else 747#else
825 fontset[style] = fontset[0]; 748 fontset[style] = fontset[0];
826#endif 749#endif
827 } 750 }
… …
829 if (parent[0]) 752 if (parent[0])
830 { 753 {
831 resize_all_windows (0, 0, 0); 754 resize_all_windows (0, 0, 0);
832 scr_remap_chars (); 755 scr_remap_chars ();
833 scr_touch (true); 756 scr_touch (true);
834 } 757 }
835 758
836 return true; 759 return true;
837} 760}
838 761
762void
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 763rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 764{
841 XChangeProperty (display->display, parent[0], 765 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 766 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 767 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 768}
845 769
770void
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 771rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 772{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 773 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 774 char *s = rxvt_wcstoutf8 (ws);
850 775
851 XChangeProperty (display->display, parent[0], 776 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 778 (const unsigned char *)s, strlen (s));
854 779
855 free (s); 780 free (s);
856 free (ws); 781 free (ws);
… …
875#if ENABLE_EWMH 800#if ENABLE_EWMH
876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
877#endif 802#endif
878} 803}
879 804
805void
806rxvt_term::set_window_color (int idx, const char *color)
807{
880#ifdef XTERM_COLOR_CHANGE 808#ifdef XTERM_COLOR_CHANGE
881void
882rxvt_term::set_window_color (int idx, const char *color)
883{
884 rxvt_color xcol; 809 rxvt_color xcol;
885 int i; 810 int i;
886 811
887 if (color == NULL || *color == '\0') 812 if (color == NULL || *color == '\0')
888 return; 813 return;
889 814
815 color = strdup (color);
816 allocated.push_back ((void *)color);
817 rs[Rs_color + idx] = color;
818
890 /* handle color aliases */ 819 /* handle color aliases */
891 if (isdigit (*color)) 820 if (isdigit (*color))
892 { 821 {
893 i = atoi (color); 822 i = atoi (color);
894 823
895 if (i >= 8 && i <= 15) 824 if (i >= 8 && i <= 15)
825 {
896 { /* bright colors */ 826 /* bright colors */
897 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
899 SET_PIXCOLOR (idx);
900 goto done; 828 goto done;
901 } 829 }
902 830
903 if (i >= 0 && i <= 7) 831 if (i >= 0 && i <= 7)
832 {
904 { /* normal colors */ 833 /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 835 goto done;
908 } 836 }
909 } 837 }
910 838
911 if (!rXParseAllocColor (&xcol, color)) 839 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 840
916 /* 841 /*
917 * FIXME: should free colors here, but no idea how to do it so instead, 842 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap 843 * so just keep gobbling up the colormap
919 */ 844 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 845
932 pix_colors_focused[idx] = xcol; 846 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 847
935 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */
937done: 848done:
938
939#if OFF_FOCUS_FADING
940 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
942#endif
943
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 849 /*TODO: handle Color_BD, scrollbar background, etc. */
945 850
851 update_fade_color (idx);
946 recolour_cursor (); 852 recolour_cursor ();
947 scr_recolour (); 853 scr_recolour ();
854#endif /* XTERM_COLOR_CHANGE */
948} 855}
949
950#else
951# define set_window_color (idx,color) ((void)0)
952#endif /* XTERM_COLOR_CHANGE */
953 856
954void 857void
955rxvt_term::recolour_cursor () 858rxvt_term::recolour_cursor ()
956{ 859{
957 XColor xcol[2]; 860 XColor fg, bg;
958 861
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 862 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 863 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 864 : pix_colors_focused[Color_fg]).get (fg);
865
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 866 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 867 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 868 : pix_colors_focused[Color_bg]).get (bg);
965 869
966 XQueryColors (display->display, display->cmap, xcol, 2); 870 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 871}
969 872
970/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
971/* 874/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 875 * find if fg/bg matches any of the normal (low-intensity) colors
973 */ 876 */
974void 877void
975rxvt_term::set_colorfgbg () 878rxvt_term::set_colorfgbg ()
976{ 879{
977 unsigned int i; 880 unsigned int i;
978 const char *xpmb = "\0"; 881 const char *xpmb = "";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 883
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 884 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 885 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 886 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 887 if (pix_colors[Color_fg] == pix_colors[i])
986 { 888 {
… …
990 892
991 for (i = Color_Black; i <= Color_White; i++) 893 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 894 if (pix_colors[Color_bg] == pix_colors[i])
993 { 895 {
994 sprintf (bstr, "%d", (i - Color_Black)); 896 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 897#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 898 xpmb = "default;";
997#endif 899#endif
998 break; 900 break;
999 } 901 }
1000 902
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 904}
1003 905
1004/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
1005 907
1006int 908bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 909rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 910{
1009 if (!screen_in_out->set (display, colour)) 911 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 912 return true;
913
914 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
915 return false;
916}
917
918void
919rxvt_term::alias_color (int dst, int src)
920{
921 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 922}
1017 923
1018/* -------------------------------------------------------------------- * 924/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 925 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 926 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 928rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 929{
1024 int fix_screen; 930 int fix_screen;
1025 int old_width = szHint.width; 931 int old_width = szHint.width;
1026 int old_height = szHint.height; 932 int old_height = szHint.height;
1027 dDisp;
1028 933
1029 window_calc (newwidth, newheight); 934 window_calc (newwidth, newheight);
935
936 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 937 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 938
1032 if (!ignoreparent) 939 if (!ignoreparent)
1033 { 940 {
1034#ifdef SMART_RESIZE 941#ifdef SMART_RESIZE
1035 /* 942 /*
… …
1039 int x, y, x1, y1; 946 int x, y, x1, y1;
1040 int dx, dy; 947 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 949 Window unused_cr;
1043 950
1044 XTranslateCoordinates (disp, parent[0], display->root, 951 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 952 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 954 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 955 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 956 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 957 * our position for handles and decorations. Counter it
1051 */ 958 */
… …
1053 { 960 {
1054 x -= x1; 961 x -= x1;
1055 y -= y1; 962 y -= y1;
1056 } 963 }
1057 964
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 965 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 966 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 967 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 968 dy = old_height - szHint.height;
1062 969
1063 /* Check position of the center of the window */ 970 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 971 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 975 if (y < y1) /* top half */
1069 dy = 0; 976 dy = 0;
1070 else if (y == y1) /* exact center */ 977 else if (y == y1) /* exact center */
1071 dy /= 2; 978 dy /= 2;
1072 979
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 981 szHint.width, szHint.height);
1075#else 982#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 984#endif
1078 } 985 }
1079 986
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 987 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 988
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 989 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 990 {
1084 if (scrollBar.state) 991 if (scrollBar.state)
1085 { 992 {
1086 XMoveResizeWindow (disp, scrollBar.win, 993 XMoveResizeWindow (dpy, scrollBar.win,
1087 window_sb_x, 0, 994 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 995 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 996 resize_scrollbar ();
1090 } 997 }
1091 998
1092 XMoveResizeWindow (disp, vt, 999 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1000 window_vt_x, window_vt_y,
1094 width, height); 1001 width, height);
1095 1002
1003#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ())
1005 update_background ();
1006#endif
1007
1096 scr_clear (); 1008 scr_clear ();
1097#ifdef XPM_BACKGROUND
1098 resize_pixmap ();
1099#endif
1100 } 1009 }
1101 1010
1102 if (fix_screen || old_height == 0) 1011 if (fix_screen || old_height == 0)
1103 scr_reset (); 1012 scr_reset ();
1104 1013
1105#ifdef XPM_BACKGROUND 1014 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1106 if (pixmap) 1015 //scr_touch (false);
1016
1017#ifdef HAVE_BG_PIXMAP
1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1107 scr_touch (false); 1020// scr_touch (false);
1108#endif 1021#endif
1109 1022
1110#ifdef USE_XIM 1023#ifdef USE_XIM
1111 IMSetStatusPosition (); 1024 IMSetPosition ();
1112#endif 1025#endif
1113} 1026}
1114 1027
1115/* 1028/*
1116 * Set the width/height of the vt window in characters. Units are pixels. 1029 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121{ 1034{
1122 XWindowAttributes wattr; 1035 XWindowAttributes wattr;
1123 1036
1124 if (newwidth == 0 || newheight == 0) 1037 if (newwidth == 0 || newheight == 0)
1125 { 1038 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1039 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1040
1128 if (newwidth == 0) 1041 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1042 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1043 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1044 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1058#ifdef USE_XIM
1146 1059
1147void 1060void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1062{
1150 fg = pix_colors[Color_fg]; 1063 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1064 bg = pix_colors [Color_bg];
1152} 1065}
1153 1066
1154void 1067void
1155rxvt_term::im_set_size (XRectangle &size) 1068rxvt_term::im_set_size (XRectangle &size)
1156{ 1069{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1107
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1109 *p = '\0';
1197 1110
1198 atom = XInternAtom (display->display, server, False); 1111 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1112 win = XGetSelectionOwner (dpy, atom);
1200 1113
1201 if (win != None) 1114 if (win != None)
1202 return True; 1115 return True;
1203 } 1116 }
1204 1117
… …
1211 XPoint nspot; 1124 XPoint nspot;
1212 XVaNestedList preedit_attr; 1125 XVaNestedList preedit_attr;
1213 1126
1214 if (!Input_Context 1127 if (!Input_Context
1215 || !focus 1128 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1129 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1130 return;
1218 1131
1219 im_set_position (nspot); 1132 im_set_position (nspot);
1220 1133
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1134 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1283 if (term->rs[Rs_imLocale]) 1196 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale); 1197 SET_LOCALE (term->locale);
1285 } 1198 }
1286 else 1199 else
1287 str = (void *)text->string.wide_char; 1200 str = (void *)text->string.wide_char;
1288 1201
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret, 1203 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first, 1204 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length, 1205 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1206 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1428 "*", 1341 "*",
1429 fheight, 1342 fheight,
1430 fheight + 1, fheight - 1, 1343 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1344 fheight - 2, fheight + 2);
1432 1345
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1346 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1347 &missing_charset_list, &missing_charset_count, &def_string);
1435 1348
1436 if (missing_charset_list) 1349 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1350 XFreeStringList (missing_charset_list);
1438 1351
… …
1479 XNBackground, bg, 1392 XNBackground, bg,
1480 XNArea, &status_rect, 1393 XNArea, &status_rect,
1481 XNFontSet, fs, 1394 XNFontSet, fs,
1482 NULL); 1395 NULL);
1483 } 1396 }
1397#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1398 else if (input_style & XIMPreeditCallbacks)
1485 { 1399 {
1400 im_set_position (spot);
1401
1486 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1402 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1487 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1403 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1488 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1404 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1489#if 0 1405# if 0
1490 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1406 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1491#endif 1407# endif
1492 1408
1493 preedit_attr = XVaCreateNestedList (0, 1409 preedit_attr = XVaCreateNestedList (0,
1410 XNSpotLocation, &spot,
1494 XNPreeditStartCallback, &xcb[0], 1411 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1], 1412 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2], 1413 XNPreeditDrawCallback , &xcb[2],
1497#if 0 1414# if 0
1498 XNPreeditCaretCallback, &xcb[3], 1415 XNPreeditCaretCallback, &xcb[3],
1499#endif 1416# endif
1500 NULL); 1417 NULL);
1501 } 1418 }
1419#endif
1502 1420
1503 Input_Context = XCreateIC (xim, 1421 Input_Context = XCreateIC (xim,
1504 XNInputStyle, input_style, 1422 XNInputStyle, input_style,
1505 XNClientWindow, vt, 1423 XNClientWindow, vt,
1506 XNFocusWindow, parent[0], 1424 XNFocusWindow, parent[0],
… …
1508 preedit_attr, 1426 preedit_attr,
1509 status_attr ? XNStatusAttributes : NULL, 1427 status_attr ? XNStatusAttributes : NULL,
1510 status_attr, NULL); 1428 status_attr, NULL);
1511 1429
1512 if (preedit_attr) XFree (preedit_attr); 1430 if (preedit_attr) XFree (preedit_attr);
1513 if (status_attr) XFree (status_attr); 1431 if (status_attr) XFree (status_attr);
1514 if (fs) XFreeFontSet (display->display, fs); 1432 if (fs) XFreeFontSet (dpy, fs);
1515 1433
1516 if (Input_Context == NULL) 1434 if (Input_Context == NULL)
1517 { 1435 {
1518 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1436 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1519 im_destroy (); 1437 im_destroy ();
… …
1524 // unfortunately, only the focus window is used by XIM, hard to fix 1442 // unfortunately, only the focus window is used by XIM, hard to fix
1525 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1526 vt_select_input (); 1444 vt_select_input ();
1527#endif 1445#endif
1528 1446
1529 if (input_style & XIMPreeditArea)
1530 IMSetStatusPosition (); 1447 IMSetPosition ();
1531 1448
1532 return true; 1449 return true;
1533} 1450}
1534 1451
1535void 1452void
… …
1593 SET_LOCALE (locale); 1510 SET_LOCALE (locale);
1594#endif 1511#endif
1595} 1512}
1596 1513
1597void 1514void
1598rxvt_term::IMSetStatusPosition () 1515rxvt_term::IMSetPosition ()
1599{ 1516{
1600 XRectangle preedit_rect, status_rect, *needed_rect; 1517 XRectangle preedit_rect, status_rect, *needed_rect;
1601 XVaNestedList preedit_attr, status_attr; 1518 XVaNestedList preedit_attr, status_attr;
1602 1519
1603 if (!Input_Context 1520 if (!Input_Context
1604 || !focus 1521 || !focus
1605 || !(input_style & XIMPreeditArea) 1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1606 || !IMisRunning ()) 1523 || !IMisRunning ())
1607 return; 1524 return;
1608 1525
1526 if (input_style & XIMPreeditPosition)
1527 {
1528 im_set_size (preedit_rect);
1529 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1530
1531 XSetICValues (Input_Context,
1532 XNPreeditAttributes, preedit_attr, NULL);
1533 }
1534 else
1535 {
1609 /* Getting the necessary width of preedit area */ 1536 /* Getting the necessary width of preedit area */
1610 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1537 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1611 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1538 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1612 XFree (status_attr); 1539 XFree (status_attr);
1613 1540
1614 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1541 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1615 XFree (needed_rect); 1542 XFree (needed_rect);
1616 1543
1617 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1544 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1618 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1545 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1619 1546
1620 XSetICValues (Input_Context, 1547 XSetICValues (Input_Context,
1621 XNPreeditAttributes, preedit_attr, 1548 XNPreeditAttributes, preedit_attr,
1622 XNStatusAttributes, status_attr, NULL); 1549 XNStatusAttributes, status_attr,
1550 NULL);
1623 1551
1552 XFree (status_attr);
1553 }
1554
1624 XFree (preedit_attr); 1555 XFree (preedit_attr);
1625 XFree (status_attr);
1626} 1556}
1627#endif /* USE_XIM */ 1557#endif /* USE_XIM */
1558
1559void
1560rxvt_term::get_window_origin (int &x, int &y)
1561{
1562 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565}
1566
1567Pixmap
1568rxvt_term::get_pixmap_property (int prop_id)
1569{
1570 if (prop_id > 0 && prop_id < NUM_XA)
1571 if (xa[prop_id])
1572 {
1573 int aformat;
1574 unsigned long nitems, bytes_after;
1575 Atom atype;
1576 unsigned char *prop = NULL;
1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579 &nitems, &bytes_after, &prop);
1580 if (result == Success && prop && atype == XA_PIXMAP)
1581 return *(Pixmap *)prop;
1582 }
1583
1584 return None;
1585}
1586
1587#ifdef HAVE_BG_PIXMAP
1588# if TRACE_PIXMAPS
1589# undef update_background
1590void
1591rxvt_term::trace_update_background (const char *file, int line)
1592{
1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594 update_background ();
1595}
1596# endif
1597
1598void
1599rxvt_term::update_background ()
1600{
1601 if (update_background_ev.is_active ())
1602 return;
1603
1604 bgPixmap.invalidate ();
1605
1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1607
1608 if (to_wait <= 0.)
1609 bgPixmap.render ();
1610 else
1611 update_background_ev.start (to_wait);
1612}
1613
1614void
1615rxvt_term::update_background_cb (ev::timer &w, int revents)
1616{
1617 make_current ();
1618
1619 update_background_ev.stop ();
1620 bgPixmap.render ();
1621 refresh_check ();
1622}
1623
1624#endif /* HAVE_BG_PIXMAP */
1628 1625
1629/*----------------------- end-of-file (C source) -----------------------*/ 1626/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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