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.202 by root, Wed Jan 25 01:08:38 2006 UTC vs.
Revision 1.306 by ayin, Mon Feb 18 09:58:04 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 164#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 167#endif
163#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 170#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 180#endif
169#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 183#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 184#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 186#endif
178 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 194
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 196
189 termlist.push_back (this); 197 termlist.push_back (this);
190 198
191#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
212 pty_ev.stop ();
203 delete pty; pty = 0; 213 delete pty; pty = 0;
204} 214}
205 215
206rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
207{ 217{
… …
214 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
215 delete fontset[i]; 225 delete fontset[i];
216#endif 226#endif
217 delete fontset[0]; 227 delete fontset[0];
218 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
219 if (display) 233 if (display)
220 { 234 {
221 dDisp;
222
223 selection_clear (); 235 selection_clear ();
224 236
225#ifdef USE_XIM 237#ifdef USE_XIM
226 im_destroy (); 238 im_destroy ();
227#endif 239#endif
228#ifdef XTERM_SCROLLBAR 240#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 243#endif
232#ifdef PLAIN_SCROLLBAR 244#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 246#endif
235#ifdef NEXT_SCROLLBAR 247#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 248 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 249 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 250 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 251 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 252 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 253 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 254 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 255 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 258#endif
247#ifdef RXVT_SCROLLBAR 259#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 263#endif
252 if (gc) XFreeGC (disp, gc); 264 if (gc) XFreeGC (dpy, gc);
253 265
254 delete drawable; 266 delete drawable;
255 // destroy all windows 267 // destroy all windows
256 if (parent[0]) 268 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 269 XDestroyWindow (dpy, parent[0]);
258 }
259 270
260 // TODO: free pixcolours, colours should become part of rxvt_display 271 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 272 if (ISSET_PIXCOLOR (i))
273 {
274 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 276 pix_colors_unfocused [i].free (this);
264#endif 277#endif
278 }
265 279
280 clear ();
281
282 display->flush (); /* ideally .put should do this */
266 displays.put (display); 283 displays.put (display);
284 }
267 285
268 scr_release (); 286 scr_release ();
269 287
270 /* clear all resources */ 288 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 290 free (allocated [i]);
273 291
274 free (selection.text); 292 free (selection.text);
275 // TODO: manage env vars in child only(!) 293 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 294 free (env_display);
278 free (env_term); 295 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 296 free (locale);
281 free (v_buffer); 297 free (v_buffer);
282 free (incr_buf); 298 free (incr_buf);
283 299
284 delete envv; 300 delete envv;
285 delete argv; 301 delete argv;
286 302
287#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
288 delete keyboard; 304 delete keyboard;
289#endif 305#endif
306#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db);
308#endif
290} 309}
291 310
292// child has exited, usually destroys 311// child has exited, usually destroys
293void 312void
294rxvt_term::child_cb (child_watcher &w, int status) 313rxvt_term::child_cb (ev::child &w, int status)
295{ 314{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 315 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 316
298 cmd_pid = 0; 317 cmd_pid = 0;
299 318
300 if (!OPTION (Opt_hold)) 319 if (!option (Opt_hold))
301 destroy (); 320 destroy ();
302} 321}
303 322
304void 323void
305rxvt_term::destroy () 324rxvt_term::destroy ()
306{ 325{
307 if (destroy_ev.active) 326 if (destroy_ev.is_active ())
308 return; 327 return;
309 328
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 330
312#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
… …
316 if (display) 335 if (display)
317 { 336 {
318#if USE_XIM 337#if USE_XIM
319 im_ev.stop (display); 338 im_ev.stop (display);
320#endif 339#endif
321#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
323#endif 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
324#if TRANSPARENT
325 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
326#endif 343#endif
327 incr_ev.stop (); 344 incr_ev.stop ();
328 termwin_ev.stop (display); 345 termwin_ev.stop (display);
329 vt_ev.stop (display); 346 vt_ev.stop (display);
330 } 347 }
331 348
332 check_ev.stop (); 349 flush_ev.stop ();
333 pty_ev.stop (); 350 pty_ev.stop ();
334#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
336#endif 353#endif
337#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
… …
345#endif 362#endif
346#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
347 pointer_ev.stop (); 364 pointer_ev.stop ();
348#endif 365#endif
349 366
350 destroy_ev.start (0); 367 destroy_ev.start ();
351} 368}
352 369
353void 370void
354rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 372{
356 make_current (); 373 make_current ();
357 374
358 delete this; 375 delete this;
359} 376}
… …
370{ 387{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
373} 390}
374 391
375#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
376static void 393static void
377print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
378{ 395{
379 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
… …
413 else 430 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 432 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 434 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 436 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 438}
422#endif 439#endif
423 440
… …
428 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
429 else 446 else
430 { 447 {
431 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 449 // so just output the error and continue
433#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
434 print_x_error (display, event); 453 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 454#endif
438 } 455 }
439 456
440 return 0; 457 return 0;
441} 458}
… …
447 DisplayString (display)); 464 DisplayString (display));
448 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
450} 467}
451 468
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 469static struct sig_handlers
525{ 470{
526 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
527 472
528 /* 473 /*
529 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
530 */ 475 */
531 void 476 void sig_term (ev::sig &w, int revents);
532 sig_term (sig_watcher &w) 477
478 sig_handlers ()
533 { 479 {
534 rxvt_emergency_cleanup (); 480 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) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
542 {
543 } 482 }
544} sig_handlers; 483} sig_handlers;
545 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
546char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
547 494
548void 495void
549rxvt_init () 496rxvt_init ()
550{ 497{
551 ptytty::init (); 498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
552 502
553 rxvt_environ = environ; 503 rxvt_environ = environ;
554 504
555 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
557 507
558 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
559 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
560 510
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
563 513
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
566 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
567 517
568 XrmInitialize (); 518 XrmInitialize ();
569} 519}
570 520
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/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
608/* 522/*
609 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
610 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
611 */ 525 */
612void 526void
613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
614{ 528{
615 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 530 int x, y, flags;
617 unsigned int w, h; 531 unsigned int w, h;
618 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
619 dDisp;
620 533
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 536 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 537
… …
679 max_width = MAX_COLS * fwidth; 592 max_width = MAX_COLS * fwidth;
680 max_height = MAX_ROWS * fheight; 593 max_height = MAX_ROWS * fheight;
681 594
682 szHint.base_width = szHint.base_height = 2 * int_bwidth; 595 szHint.base_width = szHint.base_height = 2 * int_bwidth;
683 596
684 sb_w = 0;
685 window_vt_x = window_vt_y = int_bwidth; 597 window_vt_x = window_vt_y = int_bwidth;
686 598
687 if (scrollBar.state) 599 if (scrollBar.state)
688 { 600 {
689 sb_w = scrollbar_TotalWidth (); 601 int sb_w = scrollBar.total_width ();
690 szHint.base_width += sb_w; 602 szHint.base_width += sb_w;
603
691 if (!OPTION (Opt_scrollBar_right)) 604 if (!option (Opt_scrollBar_right))
692 window_vt_x += sb_w; 605 window_vt_x += sb_w;
693 } 606 }
694 607
695 szHint.width_inc = fwidth; 608 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 609 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 610 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 611 szHint.min_height = szHint.base_height + szHint.height_inc;
699 612
700 if (newwidth && newwidth - szHint.base_width < max_width) 613 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 614 {
702 szHint.width = newwidth; 615 szHint.width = newwidth;
… …
717 { 630 {
718 min_it (height, max_height); 631 min_it (height, max_height);
719 szHint.height = szHint.base_height + height; 632 szHint.height = szHint.base_height + height;
720 } 633 }
721 634
722 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w;
724
725 if (recalc_x) 635 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637
727 if (recalc_y) 638 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 640
730 ncol = width / fwidth; 641 ncol = width / fwidth;
731 nrow = height / fheight; 642 nrow = height / fheight;
732} 643}
733 644
… …
749 ws.ws_xpixel = width; 660 ws.ws_xpixel = width;
750 ws.ws_ypixel = height; 661 ws.ws_ypixel = height;
751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
752 663
753#if 0 664#if 0
754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 665 // TIOCSWINSZ is supposed to do this automatically and correctly
755 if (cmd_pid) /* force through to the command */ 666 if (cmd_pid) /* force through to the command */
756 kill (-cmd_pid, SIGWINCH); 667 kill (-cmd_pid, SIGWINCH);
757#endif 668#endif
758} 669}
759 670
… …
788 delete fontset[0]; 699 delete fontset[0];
789 fontset[0] = fs; 700 fontset[0] = fs;
790 701
791 prop = (*fs)[1]->properties (); 702 prop = (*fs)[1]->properties ();
792 prop.height += lineSpace; 703 prop.height += lineSpace;
704
793 fs->set_prop (prop); 705 fs->set_prop (prop, false);
794 706
795 fwidth = prop.width; 707 fwidth = prop.width;
796 fheight = prop.height; 708 fheight = prop.height;
797 fbase = prop.ascent; 709 fbase = prop.ascent;
798 710
… …
807 { 719 {
808 fontset[style] = fs = new rxvt_fontset (this); 720 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 721 rxvt_fontprop prop2 = prop;
810 722
811 if (res) 723 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 724 {
725 fs->populate (res);
726 fs->set_prop (prop2, false);
727 }
813 else 728 else
814 { 729 {
815 res = fontset[0]->fontdesc; 730 fs->populate (fontset[0]->fontdesc);
816 731
817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 732 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; 733 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
734
735 fs->set_prop (prop2, true);
819 } 736 }
820 737
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 738 }
824#else 739#else
825 fontset[style] = fontset[0]; 740 fontset[style] = fontset[0];
826#endif 741#endif
827 } 742 }
… …
829 if (parent[0]) 744 if (parent[0])
830 { 745 {
831 resize_all_windows (0, 0, 0); 746 resize_all_windows (0, 0, 0);
832 scr_remap_chars (); 747 scr_remap_chars ();
833 scr_touch (true); 748 scr_touch (true);
834 } 749 }
835 750
836 return true; 751 return true;
837} 752}
838 753
754void
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 755rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 756{
841 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 758 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 759 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 760}
845 761
762void
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 763rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 764{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 765 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 766 char *s = rxvt_wcstoutf8 (ws);
850 767
851 XChangeProperty (display->display, parent[0], 768 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 769 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 770 (const unsigned char *)s, strlen (s));
854 771
855 free (s); 772 free (s);
856 free (ws); 773 free (ws);
… …
875#if ENABLE_EWMH 792#if ENABLE_EWMH
876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
877#endif 794#endif
878} 795}
879 796
797void
798rxvt_term::set_window_color (int idx, const char *color)
799{
880#ifdef XTERM_COLOR_CHANGE 800#ifdef XTERM_COLOR_CHANGE
881void
882rxvt_term::set_window_color (int idx, const char *color)
883{
884 rxvt_color xcol; 801 rxvt_color xcol;
885 int i;
886 802
887 if (color == NULL || *color == '\0') 803 if (color == NULL || *color == '\0')
888 return; 804 return;
889 805
806 color = strdup (color);
807 allocated.push_back ((void *)color);
808 rs[Rs_color + idx] = color;
809
890 /* handle color aliases */ 810 /* handle color aliases */
891 if (isdigit (*color)) 811 if (isdigit (*color))
892 { 812 {
893 i = atoi (color); 813 int i = atoi (color);
894 814
895 if (i >= 8 && i <= 15) 815 if (i >= 8 && i <= 15)
816 {
896 { /* bright colors */ 817 /* bright colors */
897 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 818 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
899 SET_PIXCOLOR (idx);
900 goto done; 819 goto done;
901 } 820 }
902 821
903 if (i >= 0 && i <= 7) 822 if (i >= 0 && i <= 7)
823 {
904 { /* normal colors */ 824 /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 825 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 826 goto done;
908 } 827 }
909 } 828 }
910 829
911 if (!rXParseAllocColor (&xcol, color)) 830 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 831
916 /* 832 /*
917 * FIXME: should free colors here, but no idea how to do it so instead, 833 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap 834 * so just keep gobbling up the colormap
919 */ 835 */
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 836
932 pix_colors_focused[idx] = xcol; 837 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 838
935 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */
937done: 839done:
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. */ 840 /*TODO: handle Color_BD, scrollbar background, etc. */
945 841
842 update_fade_color (idx);
946 recolour_cursor (); 843 recolour_cursor ();
947 scr_recolour (); 844 scr_recolour ();
845#endif /* XTERM_COLOR_CHANGE */
948} 846}
949
950#else
951# define set_window_color (idx,color) ((void)0)
952#endif /* XTERM_COLOR_CHANGE */
953 847
954void 848void
955rxvt_term::recolour_cursor () 849rxvt_term::recolour_cursor ()
956{ 850{
957 XColor xcol[2]; 851 XColor fg, bg;
958 852
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 853 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 854 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 855 : pix_colors_focused[Color_fg]).get (fg);
856
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 857 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 858 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 859 : pix_colors_focused[Color_bg]).get (bg);
965 860
966 XQueryColors (display->display, display->cmap, xcol, 2); 861 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 862}
969 863
970/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
971/* 865/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 866 * find if fg/bg matches any of the normal (low-intensity) colors
973 */ 867 */
974void 868void
975rxvt_term::set_colorfgbg () 869rxvt_term::set_colorfgbg ()
976{ 870{
977 unsigned int i; 871 unsigned int i;
978 const char *xpmb = "\0"; 872 const char *xpmb = "";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 874
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 875 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 876 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 877 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 878 if (pix_colors[Color_fg] == pix_colors[i])
986 { 879 {
… …
990 883
991 for (i = Color_Black; i <= Color_White; i++) 884 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 885 if (pix_colors[Color_bg] == pix_colors[i])
993 { 886 {
994 sprintf (bstr, "%d", (i - Color_Black)); 887 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 888#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 889 xpmb = "default;";
997#endif 890#endif
998 break; 891 break;
999 } 892 }
1000 893
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 894 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 895}
1003 896
1004/*----------------------------------------------------------------------*/ 897/*----------------------------------------------------------------------*/
1005 898
1006int 899bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 900rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 901{
1009 if (!screen_in_out->set (display, colour)) 902 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; 903 return true;
904
905 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
906 return false;
907}
908
909void
910rxvt_term::alias_color (int dst, int src)
911{
912 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 913}
1017 914
1018/* -------------------------------------------------------------------- * 915/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 916 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 917 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 919rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 920{
1024 int fix_screen; 921 int fix_screen;
1025 int old_width = szHint.width; 922 int old_width = szHint.width;
1026 int old_height = szHint.height; 923 int old_height = szHint.height;
1027 dDisp;
1028 924
1029 window_calc (newwidth, newheight); 925 window_calc (newwidth, newheight);
926
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 928 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 929
1032 if (!ignoreparent) 930 if (!ignoreparent)
1033 { 931 {
1034#ifdef SMART_RESIZE 932#ifdef SMART_RESIZE
1035 /* 933 /*
… …
1039 int x, y, x1, y1; 937 int x, y, x1, y1;
1040 int dx, dy; 938 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 939 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 940 Window unused_cr;
1043 941
1044 XTranslateCoordinates (disp, parent[0], display->root, 942 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 943 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 944 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 945 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 946 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 947 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 948 * our position for handles and decorations. Counter it
1051 */ 949 */
… …
1053 { 951 {
1054 x -= x1; 952 x -= x1;
1055 y -= y1; 953 y -= y1;
1056 } 954 }
1057 955
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 956 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 957 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 958 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 959 dy = old_height - szHint.height;
1062 960
1063 /* Check position of the center of the window */ 961 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 962 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 966 if (y < y1) /* top half */
1069 dy = 0; 967 dy = 0;
1070 else if (y == y1) /* exact center */ 968 else if (y == y1) /* exact center */
1071 dy /= 2; 969 dy /= 2;
1072 970
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 971 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 972 szHint.width, szHint.height);
1075#else 973#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 975#endif
1078 } 976 }
1079 977
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 979
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 981 {
1084 if (scrollBar.state) 982 if (scrollBar.state)
1085 {
1086 XMoveResizeWindow (disp, scrollBar.win,
1087 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 983 resize_scrollbar ();
1090 }
1091 984
1092 XMoveResizeWindow (disp, vt, 985 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1094 width, height); 987 width, height);
1095 988
989#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ())
991 update_background ();
992#endif
993
1096 scr_clear (); 994 scr_clear ();
1097#ifdef XPM_BACKGROUND
1098 resize_pixmap ();
1099#endif
1100 } 995 }
1101 996
1102 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1103 scr_reset (); 998 scr_reset ();
1104 999
1105#ifdef XPM_BACKGROUND 1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1106 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)
1107 scr_touch (false); 1006// scr_touch (false);
1108#endif 1007#endif
1109 1008
1110#ifdef USE_XIM 1009#ifdef USE_XIM
1111 IMSetStatusPosition (); 1010 IMSetPosition ();
1112#endif 1011#endif
1113} 1012}
1114 1013
1115/* 1014/*
1116 * 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.
… …
1121{ 1020{
1122 XWindowAttributes wattr; 1021 XWindowAttributes wattr;
1123 1022
1124 if (newwidth == 0 || newheight == 0) 1023 if (newwidth == 0 || newheight == 0)
1125 { 1024 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1025 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1026
1128 if (newwidth == 0) 1027 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1028 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1029 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1030 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1044#ifdef USE_XIM
1146 1045
1147void 1046void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1047rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1048{
1150 fg = pix_colors[Color_fg]; 1049 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1050 bg = pix_colors [Color_bg];
1152} 1051}
1153 1052
1154void 1053void
1155rxvt_term::im_set_size (XRectangle &size) 1054rxvt_term::im_set_size (XRectangle &size)
1156{ 1055{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1093
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1095 *p = '\0';
1197 1096
1198 atom = XInternAtom (display->display, server, False); 1097 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1098 win = XGetSelectionOwner (dpy, atom);
1200 1099
1201 if (win != None) 1100 if (win != None)
1202 return True; 1101 return True;
1203 } 1102 }
1204 1103
… …
1283 if (term->rs[Rs_imLocale]) 1182 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale); 1183 SET_LOCALE (term->locale);
1285 } 1184 }
1286 else 1185 else
1287 str = (void *)text->string.wide_char; 1186 str = (void *)text->string.wide_char;
1288 1187
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret, 1189 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first, 1190 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length, 1191 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1192 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1428 "*", 1327 "*",
1429 fheight, 1328 fheight,
1430 fheight + 1, fheight - 1, 1329 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1330 fheight - 2, fheight + 2);
1432 1331
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1332 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1333 &missing_charset_list, &missing_charset_count, &def_string);
1435 1334
1436 if (missing_charset_list) 1335 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1336 XFreeStringList (missing_charset_list);
1438 1337
… …
1479 XNBackground, bg, 1378 XNBackground, bg,
1480 XNArea, &status_rect, 1379 XNArea, &status_rect,
1481 XNFontSet, fs, 1380 XNFontSet, fs,
1482 NULL); 1381 NULL);
1483 } 1382 }
1383#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1384 else if (input_style & XIMPreeditCallbacks)
1485 { 1385 {
1486 im_set_position (spot); 1386 im_set_position (spot);
1487 1387
1488 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1388 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1489 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1389 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1490 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1390 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1491#if 0 1391# if 0
1492 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1392 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1493#endif 1393# endif
1494 1394
1495 preedit_attr = XVaCreateNestedList (0, 1395 preedit_attr = XVaCreateNestedList (0,
1496 XNSpotLocation, &spot, 1396 XNSpotLocation, &spot,
1497 XNPreeditStartCallback, &xcb[0], 1397 XNPreeditStartCallback, &xcb[0],
1498 XNPreeditDoneCallback , &xcb[1], 1398 XNPreeditDoneCallback , &xcb[1],
1499 XNPreeditDrawCallback , &xcb[2], 1399 XNPreeditDrawCallback , &xcb[2],
1500#if 0 1400# if 0
1501 XNPreeditCaretCallback, &xcb[3], 1401 XNPreeditCaretCallback, &xcb[3],
1502#endif 1402# endif
1503 NULL); 1403 NULL);
1504 } 1404 }
1405#endif
1505 1406
1506 Input_Context = XCreateIC (xim, 1407 Input_Context = XCreateIC (xim,
1507 XNInputStyle, input_style, 1408 XNInputStyle, input_style,
1508 XNClientWindow, vt, 1409 XNClientWindow, vt,
1509 XNFocusWindow, parent[0], 1410 XNFocusWindow, parent[0],
… …
1511 preedit_attr, 1412 preedit_attr,
1512 status_attr ? XNStatusAttributes : NULL, 1413 status_attr ? XNStatusAttributes : NULL,
1513 status_attr, NULL); 1414 status_attr, NULL);
1514 1415
1515 if (preedit_attr) XFree (preedit_attr); 1416 if (preedit_attr) XFree (preedit_attr);
1516 if (status_attr) XFree (status_attr); 1417 if (status_attr) XFree (status_attr);
1517 if (fs) XFreeFontSet (display->display, fs); 1418 if (fs) XFreeFontSet (dpy, fs);
1518 1419
1519 if (Input_Context == NULL) 1420 if (Input_Context == NULL)
1520 { 1421 {
1521 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1422 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1522 im_destroy (); 1423 im_destroy ();
… …
1527 // unfortunately, only the focus window is used by XIM, hard to fix 1428 // unfortunately, only the focus window is used by XIM, hard to fix
1528 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1429 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1529 vt_select_input (); 1430 vt_select_input ();
1530#endif 1431#endif
1531 1432
1532 if (input_style & XIMPreeditArea)
1533 IMSetStatusPosition (); 1433 IMSetPosition ();
1534 1434
1535 return true; 1435 return true;
1536} 1436}
1537 1437
1538void 1438void
… …
1596 SET_LOCALE (locale); 1496 SET_LOCALE (locale);
1597#endif 1497#endif
1598} 1498}
1599 1499
1600void 1500void
1601rxvt_term::IMSetStatusPosition () 1501rxvt_term::IMSetPosition ()
1602{ 1502{
1603 XRectangle preedit_rect, status_rect, *needed_rect; 1503 XRectangle preedit_rect, status_rect, *needed_rect;
1604 XVaNestedList preedit_attr, status_attr; 1504 XVaNestedList preedit_attr, status_attr;
1605 1505
1606 if (!Input_Context 1506 if (!Input_Context
1607 || !focus 1507 || !focus
1608 || !(input_style & XIMPreeditArea) 1508 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1609 || !IMisRunning ()) 1509 || !IMisRunning ())
1610 return; 1510 return;
1611 1511
1512 if (input_style & XIMPreeditPosition)
1513 {
1514 im_set_size (preedit_rect);
1515 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1516
1517 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, NULL);
1519 }
1520 else
1521 {
1612 /* Getting the necessary width of preedit area */ 1522 /* Getting the necessary width of preedit area */
1613 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1523 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1614 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1524 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1615 XFree (status_attr); 1525 XFree (status_attr);
1616 1526
1617 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1527 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1618 XFree (needed_rect); 1528 XFree (needed_rect);
1619 1529
1620 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1530 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1621 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1531 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1622 1532
1623 XSetICValues (Input_Context, 1533 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, 1534 XNPreeditAttributes, preedit_attr,
1625 XNStatusAttributes, status_attr, NULL); 1535 XNStatusAttributes, status_attr,
1536 NULL);
1626 1537
1538 XFree (status_attr);
1539 }
1540
1627 XFree (preedit_attr); 1541 XFree (preedit_attr);
1628 XFree (status_attr);
1629} 1542}
1630#endif /* USE_XIM */ 1543#endif /* USE_XIM */
1544
1545void
1546rxvt_term::get_window_origin (int &x, int &y)
1547{
1548 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551}
1552
1553Pixmap
1554rxvt_term::get_pixmap_property (int prop_id)
1555{
1556 if (prop_id > 0 && prop_id < NUM_XA)
1557 if (xa[prop_id])
1558 {
1559 int aformat;
1560 unsigned long nitems, bytes_after;
1561 Atom atype;
1562 unsigned char *prop = NULL;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP)
1567 return *(Pixmap *)prop;
1568 }
1569
1570 return None;
1571}
1572
1573#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583
1584void
1585rxvt_term::update_background ()
1586{
1587 if (update_background_ev.is_active ())
1588 return;
1589
1590 bgPixmap.invalidate ();
1591
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1593
1594 if (to_wait <= 0.)
1595 bgPixmap.render ();
1596 else
1597 update_background_ev.start (to_wait);
1598}
1599
1600void
1601rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{
1603 make_current ();
1604
1605 update_background_ev.stop ();
1606 bgPixmap.render ();
1607 refresh_check ();
1608}
1609
1610#endif /* HAVE_BG_PIXMAP */
1631 1611
1632/*----------------------- end-of-file (C source) -----------------------*/ 1612/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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