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.307 by ayin, Tue Feb 19 10:47:03 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 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 330
313#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
314 scr_overlay_off (); 332 scr_overlay_off ();
315#endif 333#endif
316 334
317 if (display) 335 if (display)
318 { 336 {
319#if USE_XIM 337#if USE_XIM
320 im_ev.stop (display); 338 im_ev.stop (display);
321#endif 339#endif
322#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
324#endif 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
325#if TRANSPARENT
326 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
327#endif 343#endif
328 incr_ev.stop (); 344 incr_ev.stop ();
329 termwin_ev.stop (display); 345 termwin_ev.stop (display);
330 vt_ev.stop (display); 346 vt_ev.stop (display);
331 } 347 }
332 348
333 check_ev.stop (); 349 flush_ev.stop ();
334 pty_ev.stop (); 350 pty_ev.stop ();
335#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
337#endif 353#endif
338#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
… …
346#endif 362#endif
347#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
348 pointer_ev.stop (); 364 pointer_ev.stop ();
349#endif 365#endif
350 366
351 destroy_ev.start (0); 367 destroy_ev.start ();
352} 368}
353 369
354void 370void
355rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 372{
357 make_current (); 373 make_current ();
358 374
359 delete this; 375 delete this;
360} 376}
… …
371{ 387{
372 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++)
373 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
374} 390}
375 391
376#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
377static void 393static void
378print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
379{ 395{
380 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
… …
414 else 430 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 432 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 434 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 436 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 438}
423#endif 439#endif
424 440
… …
429 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
430 else 446 else
431 { 447 {
432 // 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,
433 // so just output the error and continue 449 // so just output the error and continue
434#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
435 print_x_error (display, event); 453 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 454#endif
439 } 455 }
440 456
441 return 0; 457 return 0;
442} 458}
… …
448 DisplayString (display)); 464 DisplayString (display));
449 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
451} 467}
452 468
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 469static struct sig_handlers
526{ 470{
527 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
528 472
529 /* 473 /*
530 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
531 */ 475 */
532 void 476 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 477
478 sig_handlers ()
534 { 479 {
535 rxvt_emergency_cleanup (); 480 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) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
543 {
544 } 482 }
545} sig_handlers; 483} sig_handlers;
546 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
547char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
548 494
549void 495void
550rxvt_init () 496rxvt_init ()
551{ 497{
552 ptytty::init (); 498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
553 502
554 rxvt_environ = environ; 503 rxvt_environ = environ;
555 504
556 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
557 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
558 507
559 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
560 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
561 510
562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
563 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
564 513
565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
567 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
568 517
569 XrmInitialize (); 518 XrmInitialize ();
570} 519}
571 520
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/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
609/* 522/*
610 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
611 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
612 */ 525 */
613void 526void
614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
615{ 528{
616 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 530 int x, y, flags;
618 unsigned int w, h; 531 unsigned int w, h;
619 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
620 dDisp;
621 533
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 536 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 537
… …
680 max_width = MAX_COLS * fwidth; 592 max_width = MAX_COLS * fwidth;
681 max_height = MAX_ROWS * fheight; 593 max_height = MAX_ROWS * fheight;
682 594
683 szHint.base_width = szHint.base_height = 2 * int_bwidth; 595 szHint.base_width = szHint.base_height = 2 * int_bwidth;
684 596
685 sb_w = 0;
686 window_vt_x = window_vt_y = int_bwidth; 597 window_vt_x = window_vt_y = int_bwidth;
687 598
688 if (scrollBar.state) 599 if (scrollBar.state)
689 { 600 {
690 sb_w = scrollbar_TotalWidth (); 601 int sb_w = scrollBar.total_width ();
691 szHint.base_width += sb_w; 602 szHint.base_width += sb_w;
603
692 if (!OPTION (Opt_scrollBar_right)) 604 if (!option (Opt_scrollBar_right))
693 window_vt_x += sb_w; 605 window_vt_x += sb_w;
694 } 606 }
695 607
696 szHint.width_inc = fwidth; 608 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 609 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 610 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 611 szHint.min_height = szHint.base_height + szHint.height_inc;
700 612
701 if (newwidth && newwidth - szHint.base_width < max_width) 613 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 614 {
703 szHint.width = newwidth; 615 szHint.width = newwidth;
… …
718 { 630 {
719 min_it (height, max_height); 631 min_it (height, max_height);
720 szHint.height = szHint.base_height + height; 632 szHint.height = szHint.base_height + height;
721 } 633 }
722 634
723 if (scrollBar.state && OPTION (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w;
725
726 if (recalc_x) 635 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637
728 if (recalc_y) 638 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 640
731 ncol = width / fwidth; 641 ncol = width / fwidth;
732 nrow = height / fheight; 642 nrow = height / fheight;
733} 643}
734 644
… …
750 ws.ws_xpixel = width; 660 ws.ws_xpixel = width;
751 ws.ws_ypixel = height; 661 ws.ws_ypixel = height;
752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
753 663
754#if 0 664#if 0
755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 665 // TIOCSWINSZ is supposed to do this automatically and correctly
756 if (cmd_pid) /* force through to the command */ 666 if (cmd_pid) /* force through to the command */
757 kill (-cmd_pid, SIGWINCH); 667 kill (-cmd_pid, SIGWINCH);
758#endif 668#endif
759} 669}
760 670
… …
789 delete fontset[0]; 699 delete fontset[0];
790 fontset[0] = fs; 700 fontset[0] = fs;
791 701
792 prop = (*fs)[1]->properties (); 702 prop = (*fs)[1]->properties ();
793 prop.height += lineSpace; 703 prop.height += lineSpace;
704
794 fs->set_prop (prop); 705 fs->set_prop (prop, false);
795 706
796 fwidth = prop.width; 707 fwidth = prop.width;
797 fheight = prop.height; 708 fheight = prop.height;
798 fbase = prop.ascent; 709 fbase = prop.ascent;
799 710
… …
808 { 719 {
809 fontset[style] = fs = new rxvt_fontset (this); 720 fontset[style] = fs = new rxvt_fontset (this);
810 rxvt_fontprop prop2 = prop; 721 rxvt_fontprop prop2 = prop;
811 722
812 if (res) 723 if (res)
813 prop2.weight = prop2.slant = rxvt_fontprop::unset; 724 {
725 fs->populate (res);
726 fs->set_prop (prop2, false);
727 }
814 else 728 else
815 { 729 {
816 res = fontset[0]->fontdesc; 730 fs->populate (fontset[0]->fontdesc);
817 731
818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 732 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 733 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
734
735 fs->set_prop (prop2, true);
820 } 736 }
821 737
822 fs->populate (res);
823 fs->set_prop (prop2);
824 } 738 }
825#else 739#else
826 fontset[style] = fontset[0]; 740 fontset[style] = fontset[0];
827#endif 741#endif
828 } 742 }
… …
830 if (parent[0]) 744 if (parent[0])
831 { 745 {
832 resize_all_windows (0, 0, 0); 746 resize_all_windows (0, 0, 0);
833 scr_remap_chars (); 747 scr_remap_chars ();
834 scr_touch (true); 748 scr_touch (true);
835 } 749 }
836 750
837 return true; 751 return true;
838} 752}
839 753
754void
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 755rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 756{
842 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 758 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 759 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 760}
846 761
762void
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 763rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 764{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 765 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 766 char *s = rxvt_wcstoutf8 (ws);
851 767
852 XChangeProperty (display->display, parent[0], 768 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 769 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 770 (const unsigned char *)s, strlen (s));
855 771
856 free (s); 772 free (s);
857 free (ws); 773 free (ws);
… …
876#if ENABLE_EWMH 792#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
878#endif 794#endif
879} 795}
880 796
797void
798rxvt_term::set_window_color (int idx, const char *color)
799{
881#ifdef XTERM_COLOR_CHANGE 800#ifdef XTERM_COLOR_CHANGE
882void
883rxvt_term::set_window_color (int idx, const char *color)
884{
885 rxvt_color xcol; 801 rxvt_color xcol;
886 int i;
887 802
888 if (color == NULL || *color == '\0') 803 if (color == NULL || *color == '\0')
889 return; 804 return;
890 805
806 color = strdup (color);
807 allocated.push_back ((void *)color);
808 rs[Rs_color + idx] = color;
809
891 /* handle color aliases */ 810 /* handle color aliases */
892 if (isdigit (*color)) 811 if (isdigit (*color))
893 { 812 {
894 i = atoi (color); 813 int i = atoi (color);
895 814
896 if (i >= 8 && i <= 15) 815 if (i >= 8 && i <= 15)
816 {
897 { /* bright colors */ 817 /* bright colors */
898 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 818 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
900 SET_PIXCOLOR (idx);
901 goto done; 819 goto done;
902 } 820 }
903 821
904 if (i >= 0 && i <= 7) 822 if (i >= 0 && i <= 7)
823 {
905 { /* normal colors */ 824 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 825 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 826 goto done;
909 } 827 }
910 } 828 }
911 829
912 if (!rXParseAllocColor (&xcol, color)) 830 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 831
917 /* 832 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 833 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 834 * so just keep gobbling up the colormap
920 */ 835 */
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 836
933 pix_colors_focused[idx] = xcol; 837 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 838
936 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */
938done: 839done:
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. */ 840 /*TODO: handle Color_BD, scrollbar background, etc. */
946 841
842 update_fade_color (idx);
947 recolour_cursor (); 843 recolour_cursor ();
948 scr_recolour (); 844 scr_recolour ();
845#endif /* XTERM_COLOR_CHANGE */
949} 846}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */
954 847
955void 848void
956rxvt_term::recolour_cursor () 849rxvt_term::recolour_cursor ()
957{ 850{
958 XColor xcol[2]; 851 XColor fg, bg;
959 852
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 853 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 854 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 855 : pix_colors_focused[Color_fg]).get (fg);
856
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 857 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 858 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 859 : pix_colors_focused[Color_bg]).get (bg);
966 860
967 XQueryColors (display->display, display->cmap, xcol, 2); 861 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 862}
970 863
971/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
972/* 865/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 866 * find if fg/bg matches any of the normal (low-intensity) colors
974 */ 867 */
975void 868void
976rxvt_term::set_colorfgbg () 869rxvt_term::set_colorfgbg ()
977{ 870{
978 unsigned int i; 871 unsigned int i;
979 const char *xpmb = "\0"; 872 const char *xpmb = "";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 874
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 875 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 876 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 877 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 878 if (pix_colors[Color_fg] == pix_colors[i])
987 { 879 {
… …
991 883
992 for (i = Color_Black; i <= Color_White; i++) 884 for (i = Color_Black; i <= Color_White; i++)
993 if (pix_colors[Color_bg] == pix_colors[i]) 885 if (pix_colors[Color_bg] == pix_colors[i])
994 { 886 {
995 sprintf (bstr, "%d", (i - Color_Black)); 887 sprintf (bstr, "%d", (i - Color_Black));
996#ifdef XPM_BACKGROUND 888#ifdef BG_IMAGE_FROM_FILE
997 xpmb = "default;"; 889 xpmb = "default;";
998#endif 890#endif
999 break; 891 break;
1000 } 892 }
1001 893
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 894 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 895}
1004 896
1005/*----------------------------------------------------------------------*/ 897/*----------------------------------------------------------------------*/
1006 898
1007int 899bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 900rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 901{
1010 if (!screen_in_out->set (display, colour)) 902 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; 903 return true;
904
905 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
906 return false;
907}
908
909void
910rxvt_term::alias_color (int dst, int src)
911{
912 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 913}
1018 914
1019/* -------------------------------------------------------------------- * 915/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 916 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 917 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 919rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 920{
1025 int fix_screen; 921 int fix_screen;
1026 int old_width = szHint.width; 922 int old_width = szHint.width;
1027 int old_height = szHint.height; 923 int old_height = szHint.height;
1028 dDisp;
1029 924
1030 window_calc (newwidth, newheight); 925 window_calc (newwidth, newheight);
926
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1031 XSetWMNormalHints (disp, parent[0], &szHint); 928 XSetWMNormalHints (dpy, parent[0], &szHint);
1032 929
1033 if (!ignoreparent) 930 if (!ignoreparent)
1034 { 931 {
1035#ifdef SMART_RESIZE 932#ifdef SMART_RESIZE
1036 /* 933 /*
… …
1040 int x, y, x1, y1; 937 int x, y, x1, y1;
1041 int dx, dy; 938 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 939 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 940 Window unused_cr;
1044 941
1045 XTranslateCoordinates (disp, parent[0], display->root, 942 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 943 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 944 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 945 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 946 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 947 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 948 * our position for handles and decorations. Counter it
1052 */ 949 */
… …
1054 { 951 {
1055 x -= x1; 952 x -= x1;
1056 y -= y1; 953 y -= y1;
1057 } 954 }
1058 955
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 956 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 957 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 958 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 959 dy = old_height - szHint.height;
1063 960
1064 /* Check position of the center of the window */ 961 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 962 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 966 if (y < y1) /* top half */
1070 dy = 0; 967 dy = 0;
1071 else if (y == y1) /* exact center */ 968 else if (y == y1) /* exact center */
1072 dy /= 2; 969 dy /= 2;
1073 970
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 971 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 972 szHint.width, szHint.height);
1076#else 973#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 975#endif
1079 } 976 }
1080 977
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 978 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 979
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 980 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 981 {
1085 if (scrollBar.state) 982 if (scrollBar.state)
1086 { 983 scrollBar.resize ();
1087 XMoveResizeWindow (disp, scrollBar.win,
1088 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar ();
1091 }
1092 984
1093 XMoveResizeWindow (disp, vt, 985 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 986 window_vt_x, window_vt_y,
1095 width, height); 987 width, height);
1096 988
989#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ())
991 update_background ();
992#endif
993
1097 scr_clear (); 994 scr_clear ();
1098#ifdef XPM_BACKGROUND
1099 resize_pixmap ();
1100#endif
1101 } 995 }
1102 996
1103 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1104 scr_reset (); 998 scr_reset ();
1105 999
1106#ifdef XPM_BACKGROUND 1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1107 if (pixmap) 1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1108 scr_touch (false); 1006// scr_touch (false);
1109#endif 1007#endif
1110 1008
1111#ifdef USE_XIM 1009#ifdef USE_XIM
1112 IMSetStatusPosition (); 1010 IMSetPosition ();
1113#endif 1011#endif
1114} 1012}
1115 1013
1116/* 1014/*
1117 * Set the width/height of the vt window in characters. Units are pixels. 1015 * Set the width/height of the vt window in characters. Units are pixels.
… …
1122{ 1020{
1123 XWindowAttributes wattr; 1021 XWindowAttributes wattr;
1124 1022
1125 if (newwidth == 0 || newheight == 0) 1023 if (newwidth == 0 || newheight == 0)
1126 { 1024 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1025 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1026
1129 if (newwidth == 0) 1027 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1028 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1029 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1030 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1044#ifdef USE_XIM
1147 1045
1148void 1046void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1047rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1048{
1151 fg = pix_colors[Color_fg]; 1049 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1050 bg = pix_colors [Color_bg];
1153} 1051}
1154 1052
1155void 1053void
1156rxvt_term::im_set_size (XRectangle &size) 1054rxvt_term::im_set_size (XRectangle &size)
1157{ 1055{
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1093
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1095 *p = '\0';
1198 1096
1199 atom = XInternAtom (display->display, server, False); 1097 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1098 win = XGetSelectionOwner (dpy, atom);
1201 1099
1202 if (win != None) 1100 if (win != None)
1203 return True; 1101 return True;
1204 } 1102 }
1205 1103
… …
1212 XPoint nspot; 1110 XPoint nspot;
1213 XVaNestedList preedit_attr; 1111 XVaNestedList preedit_attr;
1214 1112
1215 if (!Input_Context 1113 if (!Input_Context
1216 || !focus 1114 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1115 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1116 return;
1219 1117
1220 im_set_position (nspot); 1118 im_set_position (nspot);
1221 1119
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1120 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1139 input_method = 0;
1242 } 1140 }
1243 1141
1244 Input_Context = 0; 1142 Input_Context = 0;
1245} 1143}
1144
1145#ifdef ENABLE_XIM_ONTHESPOT
1146
1147static void
1148xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1149{
1150 ((rxvt_term *)client_data)->make_current ();
1151 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1152}
1153
1154static void
1155xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1156{
1157 ((rxvt_term *)client_data)->make_current ();
1158 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1159}
1160
1161static void
1162xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1163{
1164 rxvt_term *term = (rxvt_term *)client_data;
1165 XIMText *text = call_data->text;
1166
1167 term->make_current ();
1168
1169 if (text)
1170 {
1171 void *str;
1172
1173 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 {
1175 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]);
1178
1179 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1180 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1181
1182 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale);
1184 }
1185 else
1186 str = (void *)text->string.wide_char;
1187
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length,
1192 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1193 DT_WCS_LEN, str, str ? (int)text->length : 0,
1194 DT_END));
1195 }
1196 else
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length,
1201 DT_END));
1202}
1203
1204#if 0
1205static void
1206xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1207{
1208 ((rxvt_term *)client_data)->make_current ();
1209 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1210 DT_INT, call_data->position,
1211 DT_INT, call_data->direction,
1212 DT_INT, call_data->style,
1213 DT_END));
1214}
1215#endif
1216
1217#endif
1246 1218
1247/* 1219/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1220 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1221 * open a suitable preedit type
1250 */ 1222 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1229 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1230 unsigned long fg, bg;
1259 const char *p; 1231 const char *p;
1260 char **s; 1232 char **s;
1261 XIMStyles *xim_styles; 1233 XIMStyles *xim_styles;
1234#ifdef ENABLE_XIM_ONTHESPOT
1235 XIMCallback xcb[4];
1236#endif
1262 1237
1263 set_environ (envv); 1238 set_environ (envv);
1264 1239
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1240 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1241 return false;
… …
1292 s = rxvt_splitcommastring (p); 1267 s = rxvt_splitcommastring (p);
1293 1268
1294 for (i = found = 0; !found && s[i]; i++) 1269 for (i = found = 0; !found && s[i]; i++)
1295 { 1270 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1271 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1272 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1273 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1274 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1275 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1276 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1277 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1278 input_style = XIMPreeditNone | XIMStatusNone;
1279#ifdef ENABLE_XIM_ONTHESPOT
1280 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1281 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1282#endif
1283 else
1284 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1285
1305 for (j = 0; j < xim_styles->count_styles; j++) 1286 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1287 if (input_style == xim_styles->supported_styles[j])
1307 { 1288 {
1308 rxvt_freecommastring (s); 1289 rxvt_freecommastring (s);
… …
1346 "*", 1327 "*",
1347 fheight, 1328 fheight,
1348 fheight + 1, fheight - 1, 1329 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1330 fheight - 2, fheight + 2);
1350 1331
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1332 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1333 &missing_charset_list, &missing_charset_count, &def_string);
1353 1334
1354 if (missing_charset_list) 1335 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1336 XFreeStringList (missing_charset_list);
1356 1337
… …
1397 XNBackground, bg, 1378 XNBackground, bg,
1398 XNArea, &status_rect, 1379 XNArea, &status_rect,
1399 XNFontSet, fs, 1380 XNFontSet, fs,
1400 NULL); 1381 NULL);
1401 } 1382 }
1383#if ENABLE_XIM_ONTHESPOT
1384 else if (input_style & XIMPreeditCallbacks)
1385 {
1386 im_set_position (spot);
1387
1388 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1389 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1390 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1391# if 0
1392 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1393# endif
1394
1395 preedit_attr = XVaCreateNestedList (0,
1396 XNSpotLocation, &spot,
1397 XNPreeditStartCallback, &xcb[0],
1398 XNPreeditDoneCallback , &xcb[1],
1399 XNPreeditDrawCallback , &xcb[2],
1400# if 0
1401 XNPreeditCaretCallback, &xcb[3],
1402# endif
1403 NULL);
1404 }
1405#endif
1402 1406
1403 Input_Context = XCreateIC (xim, 1407 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1408 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1409 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1410 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1412 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1413 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1414 status_attr, NULL);
1411 1415
1412 if (preedit_attr) XFree (preedit_attr); 1416 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1417 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1418 if (fs) XFreeFontSet (dpy, fs);
1415 1419
1416 if (Input_Context == NULL) 1420 if (Input_Context == NULL)
1417 { 1421 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1422 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1423 im_destroy ();
1420 return false; 1424 return false;
1421 } 1425 }
1422 1426
1427#if 0
1428 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1429 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1430 vt_select_input ();
1431#endif
1425 1432
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1433 IMSetPosition ();
1428 1434
1429 return true; 1435 return true;
1430} 1436}
1431 1437
1432void 1438void
… …
1490 SET_LOCALE (locale); 1496 SET_LOCALE (locale);
1491#endif 1497#endif
1492} 1498}
1493 1499
1494void 1500void
1495rxvt_term::IMSetStatusPosition () 1501rxvt_term::IMSetPosition ()
1496{ 1502{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1503 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1504 XVaNestedList preedit_attr, status_attr;
1499 1505
1500 if (!Input_Context 1506 if (!Input_Context
1501 || !focus 1507 || !focus
1502 || !(input_style & XIMPreeditArea) 1508 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1509 || !IMisRunning ())
1504 return; 1510 return;
1505 1511
1512 if (input_style & XIMPreeditPosition)
1513 {
1514 im_set_size (preedit_rect);
1515 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1516
1517 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, NULL);
1519 }
1520 else
1521 {
1506 /* Getting the necessary width of preedit area */ 1522 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1523 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1524 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1525 XFree (status_attr);
1510 1526
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1527 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1528 XFree (needed_rect);
1513 1529
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1530 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1531 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1532
1517 XSetICValues (Input_Context, 1533 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1534 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1535 XNStatusAttributes, status_attr,
1536 NULL);
1520 1537
1538 XFree (status_attr);
1539 }
1540
1521 XFree (preedit_attr); 1541 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1542}
1524#endif /* USE_XIM */ 1543#endif /* USE_XIM */
1544
1545void
1546rxvt_term::get_window_origin (int &x, int &y)
1547{
1548 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551}
1552
1553Pixmap
1554rxvt_term::get_pixmap_property (int prop_id)
1555{
1556 if (prop_id > 0 && prop_id < NUM_XA)
1557 if (xa[prop_id])
1558 {
1559 int aformat;
1560 unsigned long nitems, bytes_after;
1561 Atom atype;
1562 unsigned char *prop = NULL;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP)
1567 return *(Pixmap *)prop;
1568 }
1569
1570 return None;
1571}
1572
1573#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583
1584void
1585rxvt_term::update_background ()
1586{
1587 if (update_background_ev.is_active ())
1588 return;
1589
1590 bgPixmap.invalidate ();
1591
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1593
1594 if (to_wait <= 0.)
1595 bgPixmap.render ();
1596 else
1597 update_background_ev.start (to_wait);
1598}
1599
1600void
1601rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{
1603 make_current ();
1604
1605 update_background_ev.stop ();
1606 bgPixmap.render ();
1607 refresh_check ();
1608}
1609
1610#endif /* HAVE_BG_PIXMAP */
1525 1611
1526/*----------------------- end-of-file (C source) -----------------------*/ 1612/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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