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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC

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

Diff Legend

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