ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 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#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 return true;
532}
533
534static struct sig_handlers 469static struct sig_handlers
535{ 470{
536 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
537 472
538 /* 473 /*
539 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
540 */ 475 */
541 void 476 void sig_term (ev::sig &w, int revents);
542 sig_term (sig_watcher &w) 477
478 sig_handlers ()
543 { 479 {
544 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
552 {
553 } 482 }
554} sig_handlers; 483} sig_handlers;
555 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
556char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
557 494
558void 495void
559rxvt_init () 496rxvt_init ()
560{ 497{
561 ptytty::init (); 498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
562 502
563 rxvt_environ = environ; 503 rxvt_environ = environ;
564 504
565 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
567 507
568 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
569 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
570 510
571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
572 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
573 513
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
576 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
577 517
578 XrmInitialize (); 518 XrmInitialize ();
579} 519}
580 520
581/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */
584void *
585rxvt_malloc (size_t size)
586{
587 void *p = malloc (size);
588
589 if (!p)
590 rxvt_fatal ("memory allocation failure. aborting.\n");
591
592 return p;
593}
594
595void *
596rxvt_calloc (size_t number, size_t size)
597{
598 void *p = calloc (number, size);
599
600 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n");
602
603 return p;
604}
605
606void *
607rxvt_realloc (void *ptr, size_t size)
608{
609 void *p = realloc (ptr, size);
610
611 if (!p)
612 rxvt_fatal ("memory allocation failure. aborting.\n");
613
614 return p;
615}
616
617/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
618/* 522/*
619 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
621 */ 525 */
622void 526void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 528{
625 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 530 int x, y, sb_w, flags;
627 unsigned int w, h; 531 unsigned int w, h;
628 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
629 dDisp;
630 533
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 536 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 537
… …
696 599
697 if (scrollBar.state) 600 if (scrollBar.state)
698 { 601 {
699 sb_w = scrollbar_TotalWidth (); 602 sb_w = scrollbar_TotalWidth ();
700 szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
604
701 if (!OPTION (Opt_scrollBar_right)) 605 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 606 window_vt_x += sb_w;
703 } 607 }
704 608
705 szHint.width_inc = fwidth; 609 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 610 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 611 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 612 szHint.min_height = szHint.base_height + szHint.height_inc;
709 613
710 if (newwidth && newwidth - szHint.base_width < max_width) 614 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 615 {
712 szHint.width = newwidth; 616 szHint.width = newwidth;
… …
727 { 631 {
728 min_it (height, max_height); 632 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 633 szHint.height = szHint.base_height + height;
730 } 634 }
731 635
732 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 636 if (scrollBar.state && option (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 637 window_sb_x = szHint.width - sb_w;
734 638
735 if (recalc_x) 639 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641
737 if (recalc_y) 642 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 644
740 ncol = width / fwidth; 645 ncol = width / fwidth;
741 nrow = height / fheight; 646 nrow = height / fheight;
742} 647}
743 648
… …
759 ws.ws_xpixel = width; 664 ws.ws_xpixel = width;
760 ws.ws_ypixel = height; 665 ws.ws_ypixel = height;
761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
762 667
763#if 0 668#if 0
764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 669 // TIOCSWINSZ is supposed to do this automatically and correctly
765 if (cmd_pid) /* force through to the command */ 670 if (cmd_pid) /* force through to the command */
766 kill (-cmd_pid, SIGWINCH); 671 kill (-cmd_pid, SIGWINCH);
767#endif 672#endif
768} 673}
769 674
… …
798 delete fontset[0]; 703 delete fontset[0];
799 fontset[0] = fs; 704 fontset[0] = fs;
800 705
801 prop = (*fs)[1]->properties (); 706 prop = (*fs)[1]->properties ();
802 prop.height += lineSpace; 707 prop.height += lineSpace;
708
803 fs->set_prop (prop); 709 fs->set_prop (prop, false);
804 710
805 fwidth = prop.width; 711 fwidth = prop.width;
806 fheight = prop.height; 712 fheight = prop.height;
807 fbase = prop.ascent; 713 fbase = prop.ascent;
808 714
… …
817 { 723 {
818 fontset[style] = fs = new rxvt_fontset (this); 724 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 725 rxvt_fontprop prop2 = prop;
820 726
821 if (res) 727 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 728 {
729 fs->populate (res);
730 fs->set_prop (prop2, false);
731 }
823 else 732 else
824 { 733 {
825 res = fontset[0]->fontdesc; 734 fs->populate (fontset[0]->fontdesc);
826 735
827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 736 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 737 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
738
739 fs->set_prop (prop2, true);
829 } 740 }
830 741
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 742 }
834#else 743#else
835 fontset[style] = fontset[0]; 744 fontset[style] = fontset[0];
836#endif 745#endif
837 } 746 }
… …
839 if (parent[0]) 748 if (parent[0])
840 { 749 {
841 resize_all_windows (0, 0, 0); 750 resize_all_windows (0, 0, 0);
842 scr_remap_chars (); 751 scr_remap_chars ();
843 scr_touch (true); 752 scr_touch (true);
844 } 753 }
845 754
846 return true; 755 return true;
847} 756}
848 757
758void
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 759rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 760{
851 XChangeProperty (display->display, parent[0], 761 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 762 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 763 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 764}
855 765
766void
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 767rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 768{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 769 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 770 char *s = rxvt_wcstoutf8 (ws);
860 771
861 XChangeProperty (display->display, parent[0], 772 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 774 (const unsigned char *)s, strlen (s));
864 775
865 free (s); 776 free (s);
866 free (ws); 777 free (ws);
… …
885#if ENABLE_EWMH 796#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
887#endif 798#endif
888} 799}
889 800
801void
802rxvt_term::set_window_color (int idx, const char *color)
803{
890#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
891void
892rxvt_term::set_window_color (int idx, const char *color)
893{
894 rxvt_color xcol; 805 rxvt_color xcol;
895 int i; 806 int i;
896 807
897 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
898 return; 809 return;
899 810
811 color = strdup (color);
812 allocated.push_back ((void *)color);
813 rs[Rs_color + idx] = color;
814
900 /* handle color aliases */ 815 /* handle color aliases */
901 if (isdigit (*color)) 816 if (isdigit (*color))
902 { 817 {
903 i = atoi (color); 818 i = atoi (color);
904 819
905 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
821 {
906 { /* bright colors */ 822 /* bright colors */
907 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909 SET_PIXCOLOR (idx);
910 goto done; 824 goto done;
911 } 825 }
912 826
913 if (i >= 0 && i <= 7) 827 if (i >= 0 && i <= 7)
828 {
914 { /* normal colors */ 829 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 831 goto done;
918 } 832 }
919 } 833 }
920 834
921 if (!rXParseAllocColor (&xcol, color)) 835 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 836
926 /* 837 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
929 */ 840 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 841
942 pix_colors_focused[idx] = xcol; 842 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 843
945 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */
947done: 844done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 845 /*TODO: handle Color_BD, scrollbar background, etc. */
955 846
847 update_fade_color (idx);
956 recolour_cursor (); 848 recolour_cursor ();
957 scr_recolour (); 849 scr_recolour ();
850#endif /* XTERM_COLOR_CHANGE */
958} 851}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 852
964void 853void
965rxvt_term::recolour_cursor () 854rxvt_term::recolour_cursor ()
966{ 855{
967 XColor xcol[2]; 856 XColor fg, bg;
968 857
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 858 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 859 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 860 : pix_colors_focused[Color_fg]).get (fg);
861
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 862 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 863 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 864 : pix_colors_focused[Color_bg]).get (bg);
975 865
976 XQueryColors (display->display, display->cmap, xcol, 2); 866 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 867}
979 868
980/*----------------------------------------------------------------------*/ 869/*----------------------------------------------------------------------*/
981/* 870/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 871 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 872 */
984void 873void
985rxvt_term::set_colorfgbg () 874rxvt_term::set_colorfgbg ()
986{ 875{
987 unsigned int i; 876 unsigned int i;
988 const char *xpmb = "\0"; 877 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 879
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 880 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 881 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 882 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 883 if (pix_colors[Color_fg] == pix_colors[i])
996 { 884 {
… …
1000 888
1001 for (i = Color_Black; i <= Color_White; i++) 889 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 890 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 891 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 892 sprintf (bstr, "%d", (i - Color_Black));
1005#ifdef XPM_BACKGROUND 893#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 894 xpmb = "default;";
1007#endif 895#endif
1008 break; 896 break;
1009 } 897 }
1010 898
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 899 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 900}
1013 901
1014/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
1015 903
1016int 904bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 905rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 906{
1019 if (!screen_in_out->set (display, colour)) 907 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 908 return true;
909
910 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
911 return false;
912}
913
914void
915rxvt_term::alias_color (int dst, int src)
916{
917 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1026} 918}
1027 919
1028/* -------------------------------------------------------------------- * 920/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 921 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 922 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 924rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 925{
1034 int fix_screen; 926 int fix_screen;
1035 int old_width = szHint.width; 927 int old_width = szHint.width;
1036 int old_height = szHint.height; 928 int old_height = szHint.height;
1037 dDisp;
1038 929
1039 window_calc (newwidth, newheight); 930 window_calc (newwidth, newheight);
931
932 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1040 XSetWMNormalHints (disp, parent[0], &szHint); 933 XSetWMNormalHints (dpy, parent[0], &szHint);
1041 934
1042 if (!ignoreparent) 935 if (!ignoreparent)
1043 { 936 {
1044#ifdef SMART_RESIZE 937#ifdef SMART_RESIZE
1045 /* 938 /*
… …
1049 int x, y, x1, y1; 942 int x, y, x1, y1;
1050 int dx, dy; 943 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 944 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 945 Window unused_cr;
1053 946
1054 XTranslateCoordinates (disp, parent[0], display->root, 947 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 948 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 949 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 950 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 951 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 952 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 953 * our position for handles and decorations. Counter it
1061 */ 954 */
… …
1063 { 956 {
1064 x -= x1; 957 x -= x1;
1065 y -= y1; 958 y -= y1;
1066 } 959 }
1067 960
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 961 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 962 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 963 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 964 dy = old_height - szHint.height;
1072 965
1073 /* Check position of the center of the window */ 966 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 967 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 971 if (y < y1) /* top half */
1079 dy = 0; 972 dy = 0;
1080 else if (y == y1) /* exact center */ 973 else if (y == y1) /* exact center */
1081 dy /= 2; 974 dy /= 2;
1082 975
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 976 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 977 szHint.width, szHint.height);
1085#else 978#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 979 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 980#endif
1088 } 981 }
1089 982
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 983 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 984
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 985 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 986 {
1094 if (scrollBar.state) 987 if (scrollBar.state)
1095 { 988 {
1096 XMoveResizeWindow (disp, scrollBar.win, 989 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0, 990 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 991 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 992 resize_scrollbar ();
1100 } 993 }
1101 994
1102 XMoveResizeWindow (disp, vt, 995 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 996 window_vt_x, window_vt_y,
1104 width, height); 997 width, height);
1105 998
999#ifdef HAVE_BG_PIXMAP
1000 if (bgPixmap.window_size_sensitive ())
1001 update_background ();
1002#endif
1003
1106 scr_clear (); 1004 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1005 }
1111 1006
1112 if (fix_screen || old_height == 0) 1007 if (fix_screen || old_height == 0)
1113 scr_reset (); 1008 scr_reset ();
1114 1009
1115#ifdef XPM_BACKGROUND 1010 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 if (pixmap) 1011 //scr_touch (false);
1012
1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015// if (bgPixmap.pixmap)
1117 scr_touch (false); 1016// scr_touch (false);
1118#endif 1017#endif
1119 1018
1120#ifdef USE_XIM 1019#ifdef USE_XIM
1121 IMSetStatusPosition (); 1020 IMSetPosition ();
1122#endif 1021#endif
1123} 1022}
1124 1023
1125/* 1024/*
1126 * Set the width/height of the vt window in characters. Units are pixels. 1025 * Set the width/height of the vt window in characters. Units are pixels.
… …
1131{ 1030{
1132 XWindowAttributes wattr; 1031 XWindowAttributes wattr;
1133 1032
1134 if (newwidth == 0 || newheight == 0) 1033 if (newwidth == 0 || newheight == 0)
1135 { 1034 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1035 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1036
1138 if (newwidth == 0) 1037 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1038 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1039 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1040 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1054#ifdef USE_XIM
1156 1055
1157void 1056void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1058{
1160 fg = pix_colors[Color_fg]; 1059 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1060 bg = pix_colors [Color_bg];
1162} 1061}
1163 1062
1164void 1063void
1165rxvt_term::im_set_size (XRectangle &size) 1064rxvt_term::im_set_size (XRectangle &size)
1166{ 1065{
… …
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1102 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1204 1103
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1104 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1206 *p = '\0'; 1105 *p = '\0';
1207 1106
1208 atom = XInternAtom (display->display, server, False); 1107 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1108 win = XGetSelectionOwner (dpy, atom);
1210 1109
1211 if (win != None) 1110 if (win != None)
1212 return True; 1111 return True;
1213 } 1112 }
1214 1113
… …
1293 if (term->rs[Rs_imLocale]) 1192 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale); 1193 SET_LOCALE (term->locale);
1295 } 1194 }
1296 else 1195 else
1297 str = (void *)text->string.wide_char; 1196 str = (void *)text->string.wide_char;
1298 1197
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1198 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret, 1199 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first, 1200 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length, 1201 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1202 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1438 "*", 1337 "*",
1439 fheight, 1338 fheight,
1440 fheight + 1, fheight - 1, 1339 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1340 fheight - 2, fheight + 2);
1442 1341
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1342 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1343 &missing_charset_list, &missing_charset_count, &def_string);
1445 1344
1446 if (missing_charset_list) 1345 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1346 XFreeStringList (missing_charset_list);
1448 1347
… …
1489 XNBackground, bg, 1388 XNBackground, bg,
1490 XNArea, &status_rect, 1389 XNArea, &status_rect,
1491 XNFontSet, fs, 1390 XNFontSet, fs,
1492 NULL); 1391 NULL);
1493 } 1392 }
1393#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1394 else if (input_style & XIMPreeditCallbacks)
1495 { 1395 {
1496 im_set_position (spot); 1396 im_set_position (spot);
1497 1397
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1398 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1399 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1400 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1401# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1402 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1403# endif
1504 1404
1505 preedit_attr = XVaCreateNestedList (0, 1405 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1406 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1407 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1408 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1409 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1410# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1411 XNPreeditCaretCallback, &xcb[3],
1512#endif 1412# endif
1513 NULL); 1413 NULL);
1514 } 1414 }
1415#endif
1515 1416
1516 Input_Context = XCreateIC (xim, 1417 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1418 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1419 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1420 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1422 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1423 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1424 status_attr, NULL);
1524 1425
1525 if (preedit_attr) XFree (preedit_attr); 1426 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1427 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1428 if (fs) XFreeFontSet (dpy, fs);
1528 1429
1529 if (Input_Context == NULL) 1430 if (Input_Context == NULL)
1530 { 1431 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1432 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1433 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1438 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1439 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1440 vt_select_input ();
1540#endif 1441#endif
1541 1442
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1443 IMSetPosition ();
1544 1444
1545 return true; 1445 return true;
1546} 1446}
1547 1447
1548void 1448void
… …
1606 SET_LOCALE (locale); 1506 SET_LOCALE (locale);
1607#endif 1507#endif
1608} 1508}
1609 1509
1610void 1510void
1611rxvt_term::IMSetStatusPosition () 1511rxvt_term::IMSetPosition ()
1612{ 1512{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1513 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1514 XVaNestedList preedit_attr, status_attr;
1615 1515
1616 if (!Input_Context 1516 if (!Input_Context
1617 || !focus 1517 || !focus
1618 || !(input_style & XIMPreeditArea) 1518 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1519 || !IMisRunning ())
1620 return; 1520 return;
1621 1521
1522 if (input_style & XIMPreeditPosition)
1523 {
1524 im_set_size (preedit_rect);
1525 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1526
1527 XSetICValues (Input_Context,
1528 XNPreeditAttributes, preedit_attr, NULL);
1529 }
1530 else
1531 {
1622 /* Getting the necessary width of preedit area */ 1532 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1533 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1534 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1535 XFree (status_attr);
1626 1536
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1537 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1538 XFree (needed_rect);
1629 1539
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1540 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1541 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1542
1633 XSetICValues (Input_Context, 1543 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1544 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1545 XNStatusAttributes, status_attr,
1546 NULL);
1636 1547
1548 XFree (status_attr);
1549 }
1550
1637 XFree (preedit_attr); 1551 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1552}
1640#endif /* USE_XIM */ 1553#endif /* USE_XIM */
1554
1555void
1556rxvt_term::get_window_origin (int &x, int &y)
1557{
1558 Window cr;
1559 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1560/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1561}
1562
1563Pixmap
1564rxvt_term::get_pixmap_property (int prop_id)
1565{
1566 if (prop_id > 0 && prop_id < NUM_XA)
1567 if (xa[prop_id])
1568 {
1569 int aformat;
1570 unsigned long nitems, bytes_after;
1571 Atom atype;
1572 unsigned char *prop = NULL;
1573 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1574 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1575 &nitems, &bytes_after, &prop);
1576 if (result == Success && prop && atype == XA_PIXMAP)
1577 return *(Pixmap *)prop;
1578 }
1579
1580 return None;
1581}
1582
1583#ifdef HAVE_BG_PIXMAP
1584# if TRACE_PIXMAPS
1585# undef update_background
1586void
1587rxvt_term::trace_update_background (const char *file, int line)
1588{
1589 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1590 update_background ();
1591}
1592# endif
1593
1594void
1595rxvt_term::update_background ()
1596{
1597 if (update_background_ev.is_active ())
1598 return;
1599
1600 bgPixmap.invalidate ();
1601
1602 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1603
1604 if (to_wait <= 0.)
1605 bgPixmap.render ();
1606 else
1607 update_background_ev.start (to_wait);
1608}
1609
1610void
1611rxvt_term::update_background_cb (ev::timer &w, int revents)
1612{
1613 make_current ();
1614
1615 update_background_ev.stop ();
1616 bgPixmap.render ();
1617 refresh_check ();
1618}
1619
1620#endif /* HAVE_BG_PIXMAP */
1641 1621
1642/*----------------------- end-of-file (C source) -----------------------*/ 1622/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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