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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.301 by ayin, Sat Jan 19 13:00:10 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-2007 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++)
… …
283 delete argv; 303 delete argv;
284 304
285#ifdef KEYSYM_RESOURCE 305#ifdef KEYSYM_RESOURCE
286 delete keyboard; 306 delete keyboard;
287#endif 307#endif
308#ifndef NO_RESOURCES
309 XrmDestroyDatabase (option_db);
310#endif
288} 311}
289 312
290// child has exited, usually destroys 313// child has exited, usually destroys
291void 314void
292rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
293{ 316{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 318
296 cmd_pid = 0; 319 cmd_pid = 0;
297 320
298 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
299 destroy (); 322 destroy ();
300} 323}
301 324
302void 325void
303rxvt_term::destroy () 326rxvt_term::destroy ()
304{ 327{
305 if (destroy_ev.active) 328 if (destroy_ev.is_active ())
306 return; 329 return;
307 330
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 332
310#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
… …
317 im_ev.stop (display); 340 im_ev.stop (display);
318#endif 341#endif
319#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
321#endif 344#endif
322#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
324#endif 347#endif
325 incr_ev.stop (); 348 incr_ev.stop ();
326 termwin_ev.stop (display); 349 termwin_ev.stop (display);
327 vt_ev.stop (display); 350 vt_ev.stop (display);
328 } 351 }
329 352
330 check_ev.stop (); 353 flush_ev.stop ();
331 pty_ev.stop (); 354 pty_ev.stop ();
332#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
334#endif 357#endif
335#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
343#endif 366#endif
344#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
345 pointer_ev.stop (); 368 pointer_ev.stop ();
346#endif 369#endif
347 370
348 destroy_ev.start (0); 371 destroy_ev.start ();
349} 372}
350 373
351void 374void
352rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 376{
354 make_current (); 377 make_current ();
355 378
356 delete this; 379 delete this;
357} 380}
… …
368{ 391{
369 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++)
370 (*t)->emergency_cleanup (); 393 (*t)->emergency_cleanup ();
371} 394}
372 395
373#if ENABLE_FRILLS 396#if !ENABLE_MINIMAL
374static void 397static void
375print_x_error (Display *dpy, XErrorEvent *event) 398print_x_error (Display *dpy, XErrorEvent *event)
376{ 399{
377 char buffer[BUFSIZ]; 400 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 401 char mesg[BUFSIZ];
… …
411 else 434 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 436 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 438 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 440 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 442}
420#endif 443#endif
421 444
… …
426 GET_R->allowedxerror = event->error_code; 449 GET_R->allowedxerror = event->error_code;
427 else 450 else
428 { 451 {
429 // 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,
430 // so just output the error and continue 453 // so just output the error and continue
431#if ENABLE_FRILLS 454#if ENABLE_MINIMAL
455 old_xerror_handler (display, event);
456#else
432 print_x_error (display, event); 457 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 458#endif
436 } 459 }
437 460
438 return 0; 461 return 0;
439} 462}
… …
445 DisplayString (display)); 468 DisplayString (display));
446 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
448} 471}
449 472
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 dDisp;
481
482 init_xlocale ();
483
484 scr_reset (); // initialize screen
485
486#if 0
487 XSynchronize (disp, True);
488#endif
489
490#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */
493#endif
494#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent))
496 {
497 XSelectInput (disp, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root);
500 }
501#endif
502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 return true;
530}
531
532static struct sig_handlers 473static struct sig_handlers
533{ 474{
534 sig_watcher sw_term, sw_int; 475 ev::sig sw_term, sw_int;
535 476
536 /* 477 /*
537 * Catch a fatal signal and tidy up before quitting 478 * Catch a fatal signal and tidy up before quitting
538 */ 479 */
539 void 480 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 481
482 sig_handlers ()
541 { 483 {
542 rxvt_emergency_cleanup (); 484 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 485 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 486 }
552} sig_handlers; 487} sig_handlers;
553 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
554char **rxvt_environ; // startup environment 497char **rxvt_environ; // startup environment
555 498
556void 499void
557rxvt_init () 500rxvt_init ()
558{ 501{
559 ptytty::init (); 502 ptytty::init ();
503
504 if (!ev_default_loop (0))
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560 506
561 rxvt_environ = environ; 507 rxvt_environ = environ;
562 508
563 signal (SIGHUP, SIG_IGN); 509 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 510 signal (SIGPIPE, SIG_IGN);
565 511
566 sig_handlers.sw_term.start (SIGTERM); 512 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 513 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568 514
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */ 516 /* signal (SIGURG, SIG_DFL); */
571 517
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
574 XSetIOErrorHandler (rxvt_xioerror_handler); 520 XSetIOErrorHandler (rxvt_xioerror_handler);
575 521
576 XrmInitialize (); 522 XrmInitialize ();
577} 523}
578 524
579/* ------------------------------------------------------------------------- *
580 * MEMORY ALLOCATION WRAPPERS *
581 * ------------------------------------------------------------------------- */
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613}
614
615/*----------------------------------------------------------------------*/ 525/*----------------------------------------------------------------------*/
616/* 526/*
617 * window size/position calculcations for XSizeHint and other storage. 527 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 528 * if width/height are non-zero then override calculated width/height
619 */ 529 */
620void 530void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 532{
623 short recalc_x, recalc_y; 533 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 534 int x, y, sb_w, flags;
625 unsigned int w, h; 535 unsigned int w, h;
626 unsigned int max_width, max_height; 536 unsigned int max_width, max_height;
627 dDisp;
628 537
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 539 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 540 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 541
… …
694 603
695 if (scrollBar.state) 604 if (scrollBar.state)
696 { 605 {
697 sb_w = scrollbar_TotalWidth (); 606 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 607 szHint.base_width += sb_w;
608
699 if (!OPTION (Opt_scrollBar_right)) 609 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 610 window_vt_x += sb_w;
701 } 611 }
702 612
703 szHint.width_inc = fwidth; 613 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 614 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
707 617
708 if (newwidth && newwidth - szHint.base_width < max_width) 618 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 619 {
710 szHint.width = newwidth; 620 szHint.width = newwidth;
… …
725 { 635 {
726 min_it (height, max_height); 636 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 637 szHint.height = szHint.base_height + height;
728 } 638 }
729 639
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 640 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 641 window_sb_x = szHint.width - sb_w;
732 642
733 if (recalc_x) 643 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645
735 if (recalc_y) 646 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 648
738 ncol = width / fwidth; 649 ncol = width / fwidth;
739 nrow = height / fheight; 650 nrow = height / fheight;
740} 651}
741 652
… …
757 ws.ws_xpixel = width; 668 ws.ws_xpixel = width;
758 ws.ws_ypixel = height; 669 ws.ws_ypixel = height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
760 671
761#if 0 672#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 673 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 674 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 675 kill (-cmd_pid, SIGWINCH);
765#endif 676#endif
766} 677}
767 678
… …
796 delete fontset[0]; 707 delete fontset[0];
797 fontset[0] = fs; 708 fontset[0] = fs;
798 709
799 prop = (*fs)[1]->properties (); 710 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 711 prop.height += lineSpace;
712
801 fs->set_prop (prop); 713 fs->set_prop (prop, false);
802 714
803 fwidth = prop.width; 715 fwidth = prop.width;
804 fheight = prop.height; 716 fheight = prop.height;
805 fbase = prop.ascent; 717 fbase = prop.ascent;
806 718
… …
815 { 727 {
816 fontset[style] = fs = new rxvt_fontset (this); 728 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 729 rxvt_fontprop prop2 = prop;
818 730
819 if (res) 731 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 732 {
733 fs->populate (res);
734 fs->set_prop (prop2, false);
735 }
821 else 736 else
822 { 737 {
823 res = fontset[0]->fontdesc; 738 fs->populate (fontset[0]->fontdesc);
824 739
825 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;
826 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);
827 } 744 }
828 745
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 746 }
832#else 747#else
833 fontset[style] = fontset[0]; 748 fontset[style] = fontset[0];
834#endif 749#endif
835 } 750 }
… …
837 if (parent[0]) 752 if (parent[0])
838 { 753 {
839 resize_all_windows (0, 0, 0); 754 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 755 scr_remap_chars ();
841 scr_touch (true); 756 scr_touch (true);
842 } 757 }
843 758
844 return true; 759 return true;
845} 760}
846 761
762void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 763rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 764{
849 XChangeProperty (display->display, parent[0], 765 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 766 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 767 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 768}
853 769
770void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 771rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 772{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 773 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 774 char *s = rxvt_wcstoutf8 (ws);
858 775
859 XChangeProperty (display->display, parent[0], 776 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 778 (const unsigned char *)s, strlen (s));
862 779
863 free (s); 780 free (s);
864 free (ws); 781 free (ws);
… …
883#if ENABLE_EWMH 800#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 802#endif
886} 803}
887 804
805void
806rxvt_term::set_window_color (int idx, const char *color)
807{
888#ifdef XTERM_COLOR_CHANGE 808#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 809 rxvt_color xcol;
893 int i; 810 int i;
894 811
895 if (color == NULL || *color == '\0') 812 if (color == NULL || *color == '\0')
896 return; 813 return;
897 814
815 color = strdup (color);
816 allocated.push_back ((void *)color);
817 rs[Rs_color + idx] = color;
818
898 /* handle color aliases */ 819 /* handle color aliases */
899 if (isdigit (*color)) 820 if (isdigit (*color))
900 { 821 {
901 i = atoi (color); 822 i = atoi (color);
902 823
903 if (i >= 8 && i <= 15) 824 if (i >= 8 && i <= 15)
825 {
904 { /* bright colors */ 826 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 828 goto done;
909 } 829 }
910 830
911 if (i >= 0 && i <= 7) 831 if (i >= 0 && i <= 7)
832 {
912 { /* normal colors */ 833 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 835 goto done;
916 } 836 }
917 } 837 }
918 838
919 if (!rXParseAllocColor (&xcol, color)) 839 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 840
924 /* 841 /*
925 * 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,
926 * so just keep gobbling up the colormap 843 * so just keep gobbling up the colormap
927 */ 844 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 845
940 pix_colors_focused[idx] = xcol; 846 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 847
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 848done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 849 /*TODO: handle Color_BD, scrollbar background, etc. */
953 850
851 update_fade_color (idx);
954 recolour_cursor (); 852 recolour_cursor ();
955 scr_recolour (); 853 scr_recolour ();
854#endif /* XTERM_COLOR_CHANGE */
956} 855}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 856
962void 857void
963rxvt_term::recolour_cursor () 858rxvt_term::recolour_cursor ()
964{ 859{
965 XColor xcol[2]; 860 XColor fg, bg;
966 861
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 862 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 863 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 864 : pix_colors_focused[Color_fg]).get (fg);
865
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 866 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 867 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 868 : pix_colors_focused[Color_bg]).get (bg);
973 869
974 XQueryColors (display->display, display->cmap, xcol, 2); 870 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 871}
977 872
978/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
979/* 874/*
980 * 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
981 */ 876 */
982void 877void
983rxvt_term::set_colorfgbg () 878rxvt_term::set_colorfgbg ()
984{ 879{
985 unsigned int i; 880 unsigned int i;
986 const char *xpmb = "\0"; 881 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988 883
989 strcpy (fstr, "default"); 884 strcpy (fstr, "default");
990 strcpy (bstr, "default"); 885 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 886 for (i = Color_Black; i <= Color_White; i++)
… …
997 892
998 for (i = Color_Black; i <= Color_White; i++) 893 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 894 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 895 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 896 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 897#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 898 xpmb = "default;";
1004#endif 899#endif
1005 break; 900 break;
1006 } 901 }
1007 902
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 904}
1010 905
1011/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
1012 907
1013int 908bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 909rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 910{
1016 if (!screen_in_out->set (display, colour)) 911 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 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]);
1023} 922}
1024 923
1025/* -------------------------------------------------------------------- * 924/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 925 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 926 * -------------------------------------------------------------------- */
… …
1029rxvt_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)
1030{ 929{
1031 int fix_screen; 930 int fix_screen;
1032 int old_width = szHint.width; 931 int old_width = szHint.width;
1033 int old_height = szHint.height; 932 int old_height = szHint.height;
1034 dDisp;
1035 933
1036 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)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 937 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 938
1039 if (!ignoreparent) 939 if (!ignoreparent)
1040 { 940 {
1041#ifdef SMART_RESIZE 941#ifdef SMART_RESIZE
1042 /* 942 /*
… …
1046 int x, y, x1, y1; 946 int x, y, x1, y1;
1047 int dx, dy; 947 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 949 Window unused_cr;
1050 950
1051 XTranslateCoordinates (disp, parent[0], display->root, 951 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 952 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 954 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 955 /*
1056 * 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
1057 * our position for handles and decorations. Counter it 957 * our position for handles and decorations. Counter it
1058 */ 958 */
… …
1060 { 960 {
1061 x -= x1; 961 x -= x1;
1062 y -= y1; 962 y -= y1;
1063 } 963 }
1064 964
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 965 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 966 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 967 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 968 dy = old_height - szHint.height;
1069 969
1070 /* Check position of the center of the window */ 970 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 971 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 975 if (y < y1) /* top half */
1076 dy = 0; 976 dy = 0;
1077 else if (y == y1) /* exact center */ 977 else if (y == y1) /* exact center */
1078 dy /= 2; 978 dy /= 2;
1079 979
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 981 szHint.width, szHint.height);
1082#else 982#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 984#endif
1085 } 985 }
1086 986
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 987 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 988
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 989 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 990 {
1091 if (scrollBar.state) 991 if (scrollBar.state)
1092 { 992 {
1093 XMoveResizeWindow (disp, scrollBar.win, 993 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 994 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 995 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 996 resize_scrollbar ();
1097 } 997 }
1098 998
1099 XMoveResizeWindow (disp, vt, 999 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1000 window_vt_x, window_vt_y,
1101 width, height); 1001 width, height);
1102 1002
1003#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ())
1005 update_background ();
1006#endif
1007
1103 scr_clear (); 1008 scr_clear ();
1104#ifdef XPM_BACKGROUND
1105 resize_pixmap ();
1106#endif
1107 } 1009 }
1108 1010
1109 if (fix_screen || old_height == 0) 1011 if (fix_screen || old_height == 0)
1110 scr_reset (); 1012 scr_reset ();
1111 1013
1112#ifdef XPM_BACKGROUND 1014 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113 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)
1114 scr_touch (false); 1020// scr_touch (false);
1115#endif 1021#endif
1116 1022
1117#ifdef USE_XIM 1023#ifdef USE_XIM
1118 IMSetStatusPosition (); 1024 IMSetPosition ();
1119#endif 1025#endif
1120} 1026}
1121 1027
1122/* 1028/*
1123 * 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.
… …
1128{ 1034{
1129 XWindowAttributes wattr; 1035 XWindowAttributes wattr;
1130 1036
1131 if (newwidth == 0 || newheight == 0) 1037 if (newwidth == 0 || newheight == 0)
1132 { 1038 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1039 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1040
1135 if (newwidth == 0) 1041 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1042 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1043 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1044 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1058#ifdef USE_XIM
1153 1059
1154void 1060void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1062{
1157 fg = pix_colors[Color_fg]; 1063 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1064 bg = pix_colors [Color_bg];
1159} 1065}
1160 1066
1161void 1067void
1162rxvt_term::im_set_size (XRectangle &size) 1068rxvt_term::im_set_size (XRectangle &size)
1163{ 1069{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1107
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1109 *p = '\0';
1204 1110
1205 atom = XInternAtom (display->display, server, False); 1111 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1112 win = XGetSelectionOwner (dpy, atom);
1207 1113
1208 if (win != None) 1114 if (win != None)
1209 return True; 1115 return True;
1210 } 1116 }
1211 1117
… …
1290 if (term->rs[Rs_imLocale]) 1196 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1197 SET_LOCALE (term->locale);
1292 } 1198 }
1293 else 1199 else
1294 str = (void *)text->string.wide_char; 1200 str = (void *)text->string.wide_char;
1295 1201
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1203 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1204 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1205 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1206 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1435 "*", 1341 "*",
1436 fheight, 1342 fheight,
1437 fheight + 1, fheight - 1, 1343 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1344 fheight - 2, fheight + 2);
1439 1345
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1346 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1347 &missing_charset_list, &missing_charset_count, &def_string);
1442 1348
1443 if (missing_charset_list) 1349 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1350 XFreeStringList (missing_charset_list);
1445 1351
… …
1486 XNBackground, bg, 1392 XNBackground, bg,
1487 XNArea, &status_rect, 1393 XNArea, &status_rect,
1488 XNFontSet, fs, 1394 XNFontSet, fs,
1489 NULL); 1395 NULL);
1490 } 1396 }
1397#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1398 else if (input_style & XIMPreeditCallbacks)
1492 { 1399 {
1493 im_set_position (spot); 1400 im_set_position (spot);
1494 1401
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1402 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1403 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1404 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1405# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1406 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1407# endif
1501 1408
1502 preedit_attr = XVaCreateNestedList (0, 1409 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1410 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1411 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1412 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1413 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1414# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1415 XNPreeditCaretCallback, &xcb[3],
1509#endif 1416# endif
1510 NULL); 1417 NULL);
1511 } 1418 }
1419#endif
1512 1420
1513 Input_Context = XCreateIC (xim, 1421 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1422 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1423 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1424 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1426 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1427 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1428 status_attr, NULL);
1521 1429
1522 if (preedit_attr) XFree (preedit_attr); 1430 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1431 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1432 if (fs) XFreeFontSet (dpy, fs);
1525 1433
1526 if (Input_Context == NULL) 1434 if (Input_Context == NULL)
1527 { 1435 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1436 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1437 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1442 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1444 vt_select_input ();
1537#endif 1445#endif
1538 1446
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1447 IMSetPosition ();
1541 1448
1542 return true; 1449 return true;
1543} 1450}
1544 1451
1545void 1452void
… …
1603 SET_LOCALE (locale); 1510 SET_LOCALE (locale);
1604#endif 1511#endif
1605} 1512}
1606 1513
1607void 1514void
1608rxvt_term::IMSetStatusPosition () 1515rxvt_term::IMSetPosition ()
1609{ 1516{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1517 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1518 XVaNestedList preedit_attr, status_attr;
1612 1519
1613 if (!Input_Context 1520 if (!Input_Context
1614 || !focus 1521 || !focus
1615 || !(input_style & XIMPreeditArea) 1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1523 || !IMisRunning ())
1617 return; 1524 return;
1618 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 {
1619 /* Getting the necessary width of preedit area */ 1536 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1537 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1538 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1539 XFree (status_attr);
1623 1540
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1541 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1542 XFree (needed_rect);
1626 1543
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1544 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1545 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1546
1630 XSetICValues (Input_Context, 1547 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1548 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1549 XNStatusAttributes, status_attr,
1550 NULL);
1633 1551
1552 XFree (status_attr);
1553 }
1554
1634 XFree (preedit_attr); 1555 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1556}
1637#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 */
1638 1625
1639/*----------------------- end-of-file (C source) -----------------------*/ 1626/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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