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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.317 by root, Tue May 12 08:21:56 2009 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#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
219 if (display) 239 if (display)
220 { 240 {
221 dDisp;
222
223 selection_clear (); 241 selection_clear ();
224 242
225#ifdef USE_XIM 243#ifdef USE_XIM
226 im_destroy (); 244 im_destroy ();
227#endif 245#endif
228#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 247 if (gc) XFreeGC (dpy, gc);
253 248
254 delete drawable; 249 delete drawable;
255 // destroy all windows 250 // destroy all windows
256 if (parent[0]) 251 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 252 XDestroyWindow (dpy, parent[0]);
258 }
259 253
260 // TODO: free pixcolours, colours should become part of rxvt_display 254 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 255 if (ISSET_PIXCOLOR (i))
256 {
257 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 259 pix_colors_unfocused [i].free (this);
264#endif 260#endif
261 }
265 262
263 clear ();
264
265 display->flush (); /* ideally .put should do this */
266 displays.put (display); 266 displays.put (display);
267 }
267 268
268 scr_release (); 269 scr_release ();
269 270
270 /* clear all resources */ 271 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 273 free (allocated [i]);
273 274
274 free (selection.text); 275 free (selection.text);
275 // TODO: manage env vars in child only(!) 276 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 277 free (env_display);
278 free (env_term); 278 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 279 free (locale);
281 free (v_buffer); 280 free (v_buffer);
282 free (incr_buf); 281 free (incr_buf);
283 282
284 delete envv; 283 delete envv;
285 delete argv; 284 delete argv;
286 285
287#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
288 delete keyboard; 287 delete keyboard;
289#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
290} 292}
291 293
292// child has exited, usually destroys 294// child has exited, usually destroys
293void 295void
294rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
295{ 297{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 299
298 cmd_pid = 0; 300 cmd_pid = 0;
299 301
300 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
301 destroy (); 303 destroy ();
302} 304}
303 305
304void 306void
305rxvt_term::destroy () 307rxvt_term::destroy ()
306{ 308{
307 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
308 return; 310 return;
309 311
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 313
313#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
314 scr_overlay_off (); 315 scr_overlay_off ();
315#endif 316#endif
316 317
317 if (display) 318 if (display)
318 { 319 {
319#if USE_XIM 320#if USE_XIM
320 im_ev.stop (display); 321 im_ev.stop (display);
321#endif 322#endif
322#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
324#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
325#if TRANSPARENT
326 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
327#endif 326#endif
328 incr_ev.stop (); 327 incr_ev.stop ();
329 termwin_ev.stop (display); 328 termwin_ev.stop (display);
330 vt_ev.stop (display); 329 vt_ev.stop (display);
331 } 330 }
332 331
333 check_ev.stop (); 332 flush_ev.stop ();
334 pty_ev.stop (); 333 pty_ev.stop ();
335#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
337#endif 336#endif
338#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
346#endif 345#endif
347#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
348 pointer_ev.stop (); 347 pointer_ev.stop ();
349#endif 348#endif
350 349
351 destroy_ev.start (0); 350 destroy_ev.start ();
352} 351}
353 352
354void 353void
355rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 355{
357 make_current (); 356 make_current ();
358 357
359 delete this; 358 delete this;
360} 359}
… …
371{ 370{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 372 (*t)->emergency_cleanup ();
374} 373}
375 374
376#if ENABLE_FRILLS 375#if !ENABLE_MINIMAL
377static void 376static void
378print_x_error (Display *dpy, XErrorEvent *event) 377print_x_error (Display *dpy, XErrorEvent *event)
379{ 378{
380 char buffer[BUFSIZ]; 379 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 380 char mesg[BUFSIZ];
… …
414 else 413 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 415 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 417 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 419 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 421}
423#endif 422#endif
424 423
… …
429 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
430 else 429 else
431 { 430 {
432 // GET_R is most likely not the terminal which caused the error, 431 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 432 // so just output the error and continue
434#if ENABLE_FRILLS 433#if ENABLE_MINIMAL
434 old_xerror_handler (display, event);
435#else
435 print_x_error (display, event); 436 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 437#endif
439 } 438 }
440 439
441 return 0; 440 return 0;
442} 441}
… …
448 DisplayString (display)); 447 DisplayString (display));
449 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
451} 450}
452 451
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv)
456{
457 SET_R (this);
458 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :(
460
461 if (!init_vars ())
462 return false;
463
464 init_secondary ();
465
466 const char **cmd_argv = init_resources (argc, argv);
467
468#ifdef KEYSYM_RESOURCE
469 keyboard->register_done ();
470#endif
471
472#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */
475#endif
476
477 pty = rxvt_new_ptytty ();
478
479 create_windows (argc, argv);
480
481 dDisp;
482
483 init_xlocale ();
484
485 scr_reset (); // initialize screen
486
487#if 0
488 XSynchronize (disp, True);
489#endif
490
491#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */
494#endif
495#ifdef TRANSPARENT
496 if (OPTION (Opt_transparent))
497 {
498 XSelectInput (disp, display->root, PropertyChangeMask);
499 check_our_parents ();
500 rootwin_ev.start (display, display->root);
501 }
502#endif
503
504 set_colorfgbg ();
505
506 init_command (cmd_argv);
507
508 free (cmd_argv);
509
510 if (pty->pty >= 0)
511 pty_ev.start (pty->pty, EVENT_READ);
512
513 check_ev.start ();
514
515 HOOK_INVOKE ((this, HOOK_START, DT_END));
516
517 XMapWindow (disp, vt);
518 XMapWindow (disp, parent[0]);
519
520 return true;
521}
522
523static struct sig_handlers 452static struct sig_handlers
524{ 453{
525 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
526 455
527 /* 456 /*
528 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
529 */ 458 */
530 void 459 void sig_term (ev::sig &w, int revents);
531 sig_term (sig_watcher &w) 460
461 sig_handlers ()
532 { 462 {
533#ifdef DEBUG_CMD 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum);
539 }
540
541 sig_handlers ()
542 : sw_term (this, &sig_handlers::sig_term),
543 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
544 {
545 } 465 }
546} sig_handlers; 466} sig_handlers;
547 467
468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
548char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
549 477
550void 478void
551rxvt_init () 479rxvt_init ()
552{ 480{
553 uid_t uid = getuid (); 481 ptytty::init ();
554 gid_t gid = getgid ();
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566 482
567 // drop privileges 483 if (!ev_default_loop (0))
568#if HAVE_SETRESUID 484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583 485
584 rxvt_environ = environ; 486 rxvt_environ = environ;
585 487
586 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
588 490
589 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
590 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
591 493
592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
593 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
594 496
595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
597 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
598 500
599 XrmInitialize (); 501 XrmInitialize ();
600} 502}
601 503
602/* ------------------------------------------------------------------------- *
603 * MEMORY ALLOCATION WRAPPERS *
604 * ------------------------------------------------------------------------- */
605void *
606rxvt_malloc (size_t size)
607{
608 void *p = malloc (size);
609
610 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n");
612
613 return p;
614}
615
616void *
617rxvt_calloc (size_t number, size_t size)
618{
619 void *p = calloc (number, size);
620
621 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n");
623
624 return p;
625}
626
627void *
628rxvt_realloc (void *ptr, size_t size)
629{
630 void *p = realloc (ptr, size);
631
632 if (!p)
633 rxvt_fatal ("memory allocation failure. aborting.\n");
634
635 return p;
636}
637
638/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
639/* 505/*
640 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
642 */ 508 */
643void 509void
644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 511{
646 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 513 int x, y, flags;
648 unsigned int w, h; 514 unsigned int w, h;
649 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 516
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 519 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 520
… …
666 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
667 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
668 530
669 if (flags & WidthValue) 531 if (flags & WidthValue)
670 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
671 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
672 szHint.flags |= USSize; 537 szHint.flags |= USSize;
673 } 538 }
674 539
675 if (flags & HeightValue) 540 if (flags & HeightValue)
676 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
677 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
678 szHint.flags |= USSize; 546 szHint.flags |= USSize;
679 } 547 }
680 548
681 if (flags & XValue) 549 if (flags & XValue)
682 { 550 {
… …
713 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
714 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
715 583
716 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
717 585
718 sb_w = 0;
719 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
720 587
721 if (scrollBar.state) 588 if (scrollBar.state)
722 { 589 {
723 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
724 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
592
725 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
726 window_vt_x += sb_w; 594 window_vt_x += sb_w;
727 } 595 }
728 596
729 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
730 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
731 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
732 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
733 601
734 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
735 { 603 {
736 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
751 { 619 {
752 min_it (height, max_height); 620 min_it (height, max_height);
753 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
754 } 622 }
755 623
756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w;
758
759 if (recalc_x) 624 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626
761 if (recalc_y) 627 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 629
764 ncol = width / fwidth; 630 ncol = width / fwidth;
765 nrow = height / fheight; 631 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 632}
771 633
772/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
773/* 635/*
774 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
… …
784 646
785 ws.ws_col = ncol; 647 ws.ws_col = ncol;
786 ws.ws_row = nrow; 648 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 652
791#if 0 653#if 0
792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
795#endif 657#endif
796} 658}
797 659
… …
826 delete fontset[0]; 688 delete fontset[0];
827 fontset[0] = fs; 689 fontset[0] = fs;
828 690
829 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
830 prop.height += lineSpace; 692 prop.height += lineSpace;
693
831 fs->set_prop (prop); 694 fs->set_prop (prop, false);
832 695
833 fwidth = prop.width; 696 fwidth = prop.width;
834 fheight = prop.height; 697 fheight = prop.height;
835 fbase = prop.ascent; 698 fbase = prop.ascent;
836 699
… …
845 { 708 {
846 fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
847 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
848 711
849 if (res) 712 if (res)
850 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
851 else 717 else
852 { 718 {
853 res = fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
854 720
855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 721 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 722 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
723
724 fs->set_prop (prop2, true);
857 } 725 }
858 726
859 fs->populate (res);
860 fs->set_prop (prop2);
861 } 727 }
862#else 728#else
863 fontset[style] = fontset[0]; 729 fontset[style] = fontset[0];
864#endif 730#endif
865 } 731 }
… …
867 if (parent[0]) 733 if (parent[0])
868 { 734 {
869 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
870 scr_remap_chars (); 736 scr_remap_chars ();
871 scr_touch (true); 737 scr_touch (true);
872 } 738 }
873 739
874 return true; 740 return true;
875} 741}
876 742
743void
877void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
878{ 745{
879 XChangeProperty (display->display, parent[0], 746 XChangeProperty (dpy, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 749}
883 750
751void
884void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
885{ 753{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
888 756
889 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 759 (const unsigned char *)s, strlen (s));
892 760
893 free (s); 761 free (s);
894 free (ws); 762 free (ws);
… …
913#if ENABLE_EWMH 781#if ENABLE_EWMH
914 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
915#endif 783#endif
916} 784}
917 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
918#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
919void
920rxvt_term::set_window_color (int idx, const char *color)
921{
922 rxvt_color xcol; 790 rxvt_color xcol;
923 int i;
924 791
925 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
926 return; 793 return;
927 794
795 color = strdup (color);
796 allocated.push_back ((void *)color);
797 rs[Rs_color + idx] = color;
798
928 /* handle color aliases */ 799 /* handle color aliases */
929 if (isdigit (*color)) 800 if (isdigit (*color))
930 { 801 {
931 i = atoi (color); 802 int i = atoi (color);
932 803
933 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
934 { /* bright colors */ 806 /* bright colors */
935 i -= 8;
936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
937 SET_PIXCOLOR (idx);
938 goto done; 808 goto done;
939 } 809 }
940 810
941 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
942 { /* normal colors */ 813 /* normal colors */
943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
944 SET_PIXCOLOR (idx);
945 goto done; 815 goto done;
946 } 816 }
947 } 817 }
948 818
949 if (!rXParseAllocColor (&xcol, color)) 819 set_color (xcol, color);
950 return;
951
952 /* XStoreColor (display->display, display->cmap, XColor*); */
953 820
954 /* 821 /*
955 * FIXME: should free colors here, but no idea how to do it so instead, 822 * FIXME: should free colors here, but no idea how to do it so instead,
956 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
957 */ 824 */
958# if 0
959 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[idx] == pix_colors[i])
961 break;
962 if (i > Color_White)
963 {
964 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen));
967 }
968# endif
969 825
970 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx);
972 827
973 /* XSetWindowAttributes attr; */
974 /* Cursor cursor; */
975done: 828done:
976
977#if OFF_FOCUS_FADING
978 if (rs[Rs_fade])
979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
980#endif
981
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
983 830
831 update_fade_color (idx);
984 recolour_cursor (); 832 recolour_cursor ();
985 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
986} 835}
987
988#else
989# define set_window_color (idx,color) ((void)0)
990#endif /* XTERM_COLOR_CHANGE */
991 836
992void 837void
993rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
994{ 839{
995 XColor xcol[2]; 840 XColor fg, bg;
996 841
997 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 842 (ISSET_PIXCOLOR (Color_pointer_fg)
998 ? pix_colors_focused[Color_pointer_fg] 843 ? pix_colors_focused[Color_pointer_fg]
999 : pix_colors_focused[Color_fg]; 844 : pix_colors_focused[Color_fg]).get (fg);
845
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 846 (ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 847 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 848 : pix_colors_focused[Color_bg]).get (bg);
1003 849
1004 XQueryColors (display->display, display->cmap, xcol, 2); 850 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1006} 851}
1007 852
1008/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
1009/* 854/*
1010 * find if fg/bg matches any of the normal (low-intensity) colors 855 * find if fg/bg matches any of the normal (low-intensity) colors
1011 */ 856 */
1012void 857void
1013rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
1014{ 859{
1015 unsigned int i; 860 unsigned int i;
1016 const char *xpmb = "\0"; 861 const char *xpmb = "";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 863
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 867 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 868 {
… …
1028 872
1029 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
1030 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
1031 { 875 {
1032 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1033#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1034 xpmb = "default;"; 878 xpmb = "default;";
1035#endif 879#endif
1036 break; 880 break;
1037 } 881 }
1038 882
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 884}
1041 885
1042/*----------------------------------------------------------------------*/ 886/*----------------------------------------------------------------------*/
1043 887
1044int 888bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 889rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 890{
1047 if (!screen_in_out->set (display, colour)) 891 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 return true; 892 return true;
893
894 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
895 return false;
896}
897
898void
899rxvt_term::alias_color (int dst, int src)
900{
901 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1054} 902}
1055 903
1056/* -------------------------------------------------------------------- * 904/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 905 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 906 * -------------------------------------------------------------------- */
1059void 907void
1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 908rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1061{ 909{
1062 int fix_screen; 910 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 911 int old_width = szHint.width;
1064 dDisp; 912 int old_height = szHint.height;
1065 913
1066 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
915
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
1067 XSetWMNormalHints (disp, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1068 925
1069 if (!ignoreparent) 926 if (!ignoreparent)
1070 { 927 {
1071#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1072 /* 929 /*
… …
1076 int x, y, x1, y1; 933 int x, y, x1, y1;
1077 int dx, dy; 934 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 936 Window unused_cr;
1080 937
1081 XTranslateCoordinates (disp, parent[0], display->root, 938 XTranslateCoordinates (dpy, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 939 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 941 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 942 /*
1086 * if display->root isn't the parent window, a WM will probably have offset 943 * if display->root isn't the parent window, a WM will probably have offset
1087 * our position for handles and decorations. Counter it 944 * our position for handles and decorations. Counter it
1088 */ 945 */
… …
1090 { 947 {
1091 x -= x1; 948 x -= x1;
1092 y -= y1; 949 y -= y1;
1093 } 950 }
1094 951
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 952 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 953 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 954 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 955 dy = old_height - szHint.height;
1099 956
1100 /* Check position of the center of the window */ 957 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 958 if (x < x1) /* left half */
1102 dx = 0; 959 dx = 0;
… …
1105 if (y < y1) /* top half */ 962 if (y < y1) /* top half */
1106 dy = 0; 963 dy = 0;
1107 else if (y == y1) /* exact center */ 964 else if (y == y1) /* exact center */
1108 dy /= 2; 965 dy /= 2;
1109 966
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 968 szHint.width, szHint.height);
1112#else 969#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1114#endif 971#endif
1115 } 972 }
973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
1116 976
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 978
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 980 {
1121 if (scrollBar.state) 981 if (scrollBar.state)
1122 { 982 scrollBar.resize ();
1123 XMoveResizeWindow (disp, scrollBar.win,
1124 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar ();
1127 }
1128 983
1129 XMoveResizeWindow (disp, vt, 984 XMoveResizeWindow (dpy, vt,
1130 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1131 width, height); 986 width, height);
1132 987
1133 scr_clear (); 988#ifdef HAVE_BG_PIXMAP
1134#ifdef XPM_BACKGROUND 989 if (bgPixmap.window_size_sensitive ())
1135 resize_pixmap (); 990 update_background ();
1136#endif 991#endif
1137 } 992 }
1138 993
1139 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 995 scr_reset ();
1154 996
1155 if (curr_screen >= 0) /* this is not the first time through */ 997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1156 { 998 //scr_touch (false);
1157 scr_change_screen (curr_screen);
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161 999
1162 old_width = szHint.width; 1000#ifdef HAVE_BG_PIXMAP
1163 old_height = szHint.height; 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1164 1002// if (bgPixmap.pixmap)
1165#ifdef XPM_BACKGROUND
1166 if (pixmap)
1167 scr_touch (false); 1003// scr_touch (false);
1168#endif 1004#endif
1169 1005
1170#ifdef USE_XIM 1006#ifdef USE_XIM
1171 IMSetStatusPosition (); 1007 IMSetPosition ();
1172#endif 1008#endif
1173} 1009}
1174 1010
1175/* 1011/*
1176 * Set the width/height of the vt window in characters. Units are pixels. 1012 * Set the width/height of the vt window in characters. Units are pixels.
… …
1181{ 1017{
1182 XWindowAttributes wattr; 1018 XWindowAttributes wattr;
1183 1019
1184 if (newwidth == 0 || newheight == 0) 1020 if (newwidth == 0 || newheight == 0)
1185 { 1021 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1022 XGetWindowAttributes (dpy, display->root, &wattr);
1187 1023
1188 if (newwidth == 0) 1024 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1025 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1026 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1027 newheight = wattr.height - szHint.base_height;
… …
1205#ifdef USE_XIM 1041#ifdef USE_XIM
1206 1042
1207void 1043void
1208rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1209{ 1045{
1210 fg = pix_colors[Color_fg]; 1046 fg = pix_colors [Color_fg];
1211 bg = pix_colors[Color_bg]; 1047 bg = pix_colors [Color_bg];
1212} 1048}
1213 1049
1214void 1050void
1215rxvt_term::im_set_size (XRectangle &size) 1051rxvt_term::im_set_size (XRectangle &size)
1216{ 1052{
… …
1239 1075
1240/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1241bool 1077bool
1242rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1243{ 1079{
1244 char *p;
1245 Atom atom; 1080 Atom atom;
1246 Window win; 1081 Window win;
1247 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1248 1083
1249 /* get current locale modifier */ 1084 /* get current locale modifier */
1250 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1251 { 1086 {
1252 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1254 1089
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1256 *p = '\0'; 1091 *p = '\0';
1257 1092
1258 atom = XInternAtom (display->display, server, False); 1093 atom = XInternAtom (dpy, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1260 1095
1261 if (win != None) 1096 if (win != None)
1262 return True; 1097 return True;
1263 } 1098 }
1264 1099
… …
1271 XPoint nspot; 1106 XPoint nspot;
1272 XVaNestedList preedit_attr; 1107 XVaNestedList preedit_attr;
1273 1108
1274 if (!Input_Context 1109 if (!Input_Context
1275 || !focus 1110 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1111 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1112 return;
1278 1113
1279 im_set_position (nspot); 1114 im_set_position (nspot);
1280 1115
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1116 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1135 input_method = 0;
1301 } 1136 }
1302 1137
1303 Input_Context = 0; 1138 Input_Context = 0;
1304} 1139}
1140
1141#ifdef ENABLE_XIM_ONTHESPOT
1142
1143static void
1144xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1145{
1146 ((rxvt_term *)client_data)->make_current ();
1147 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1148}
1149
1150static void
1151xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1152{
1153 ((rxvt_term *)client_data)->make_current ();
1154 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1155}
1156
1157static void
1158xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1159{
1160 rxvt_term *term = (rxvt_term *)client_data;
1161 XIMText *text = call_data->text;
1162
1163 term->make_current ();
1164
1165 if (text)
1166 {
1167 void *str;
1168
1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1170 {
1171 // of course, X makes it ugly again
1172 if (term->rs[Rs_imLocale])
1173 SET_LOCALE (term->rs[Rs_imLocale]);
1174
1175 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1176 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1177
1178 if (term->rs[Rs_imLocale])
1179 SET_LOCALE (term->locale);
1180 }
1181 else
1182 str = (void *)text->string.wide_char;
1183
1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1185 DT_INT, call_data->caret,
1186 DT_INT, call_data->chg_first,
1187 DT_INT, call_data->chg_length,
1188 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1189 DT_WCS_LEN, str, str ? (int)text->length : 0,
1190 DT_END));
1191 }
1192 else
1193 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1194 DT_INT, call_data->caret,
1195 DT_INT, call_data->chg_first,
1196 DT_INT, call_data->chg_length,
1197 DT_END));
1198}
1199
1200#if 0
1201static void
1202xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1203{
1204 ((rxvt_term *)client_data)->make_current ();
1205 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1206 DT_INT, call_data->position,
1207 DT_INT, call_data->direction,
1208 DT_INT, call_data->style,
1209 DT_END));
1210}
1211#endif
1212
1213#endif
1305 1214
1306/* 1215/*
1307 * Try to open a XIM with the current modifiers, then see if we can 1216 * Try to open a XIM with the current modifiers, then see if we can
1308 * open a suitable preedit type 1217 * open a suitable preedit type
1309 */ 1218 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1225 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1226 unsigned long fg, bg;
1318 const char *p; 1227 const char *p;
1319 char **s; 1228 char **s;
1320 XIMStyles *xim_styles; 1229 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1321 1233
1322 set_environ (envv); 1234 set_environ (envv);
1323 1235
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1237 return false;
1326 1238
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1239 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1240 if (input_method == NULL)
1330 return false; 1241 return false;
1331 1242
1332 xim = input_method->xim; 1243 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1263 s = rxvt_splitcommastring (p);
1353 1264
1354 for (i = found = 0; !found && s[i]; i++) 1265 for (i = found = 0; !found && s[i]; i++)
1355 { 1266 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1267 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1268 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1269 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1270 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1271 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1272 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1273 else if (!strcmp (s[i], "None"))
1363 input_style = (XIMPreeditNone | XIMStatusNone); 1274 input_style = XIMPreeditNone | XIMStatusNone;
1275#ifdef ENABLE_XIM_ONTHESPOT
1276 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1277 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1278#endif
1279 else
1280 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1281
1365 for (j = 0; j < xim_styles->count_styles; j++) 1282 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1283 if (input_style == xim_styles->supported_styles[j])
1367 { 1284 {
1368 rxvt_freecommastring (s); 1285 rxvt_freecommastring (s);
… …
1406 "*", 1323 "*",
1407 fheight, 1324 fheight,
1408 fheight + 1, fheight - 1, 1325 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1326 fheight - 2, fheight + 2);
1410 1327
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1328 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1329 &missing_charset_list, &missing_charset_count, &def_string);
1413 1330
1414 if (missing_charset_list) 1331 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1332 XFreeStringList (missing_charset_list);
1416 1333
… …
1457 XNBackground, bg, 1374 XNBackground, bg,
1458 XNArea, &status_rect, 1375 XNArea, &status_rect,
1459 XNFontSet, fs, 1376 XNFontSet, fs,
1460 NULL); 1377 NULL);
1461 } 1378 }
1379#if ENABLE_XIM_ONTHESPOT
1380 else if (input_style & XIMPreeditCallbacks)
1381 {
1382 im_set_position (spot);
1383
1384 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1385 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1386 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1387# if 0
1388 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1389# endif
1390
1391 preedit_attr = XVaCreateNestedList (0,
1392 XNSpotLocation, &spot,
1393 XNPreeditStartCallback, &xcb[0],
1394 XNPreeditDoneCallback , &xcb[1],
1395 XNPreeditDrawCallback , &xcb[2],
1396# if 0
1397 XNPreeditCaretCallback, &xcb[3],
1398# endif
1399 NULL);
1400 }
1401#endif
1462 1402
1463 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1405 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1406 XNFocusWindow, parent[0],
… …
1468 preedit_attr, 1408 preedit_attr,
1469 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1410 status_attr, NULL);
1471 1411
1472 if (preedit_attr) XFree (preedit_attr); 1412 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1413 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1414 if (fs) XFreeFontSet (dpy, fs);
1475 1415
1476 if (Input_Context == NULL) 1416 if (Input_Context == NULL)
1477 { 1417 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1419 im_destroy ();
1480 return false; 1420 return false;
1481 } 1421 }
1482 1422
1483 if (input_style & XIMPreeditArea) 1423#if 0
1424 // unfortunately, only the focus window is used by XIM, hard to fix
1425 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1426 vt_select_input ();
1427#endif
1428
1484 IMSetStatusPosition (); 1429 IMSetPosition ();
1485 1430
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1431 return true;
1488} 1432}
1489 1433
1490void 1434void
1491rxvt_term::im_cb () 1435rxvt_term::im_cb ()
… …
1497 1441
1498 make_current (); 1442 make_current ();
1499 1443
1500 im_destroy (); 1444 im_destroy ();
1501 1445
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1446 if (Input_Context)
1504 return; 1447 return;
1505 1448
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1449#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1450 if (rs[Rs_imLocale])
… …
1549 SET_LOCALE (locale); 1492 SET_LOCALE (locale);
1550#endif 1493#endif
1551} 1494}
1552 1495
1553void 1496void
1554rxvt_term::IMSetStatusPosition () 1497rxvt_term::IMSetPosition ()
1555{ 1498{
1556 XRectangle preedit_rect, status_rect, *needed_rect; 1499 XRectangle preedit_rect, status_rect, *needed_rect;
1557 XVaNestedList preedit_attr, status_attr; 1500 XVaNestedList preedit_attr, status_attr;
1558 1501
1559 if (!Input_Context 1502 if (!Input_Context
1560 || !focus 1503 || !focus
1561 || !(input_style & XIMPreeditArea) 1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1562 || !IMisRunning ()) 1505 || !IMisRunning ())
1563 return; 1506 return;
1564 1507
1508 if (input_style & XIMPreeditPosition)
1509 {
1510 im_set_size (preedit_rect);
1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1512
1513 XSetICValues (Input_Context,
1514 XNPreeditAttributes, preedit_attr, NULL);
1515 }
1516 else
1517 {
1565 /* Getting the necessary width of preedit area */ 1518 /* Getting the necessary width of preedit area */
1566 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1519 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1567 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1520 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1568 XFree (status_attr); 1521 XFree (status_attr);
1569 1522
1570 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1523 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1571 XFree (needed_rect); 1524 XFree (needed_rect);
1572 1525
1573 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1526 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1574 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1527 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1575 1528
1576 XSetICValues (Input_Context, 1529 XSetICValues (Input_Context,
1577 XNPreeditAttributes, preedit_attr, 1530 XNPreeditAttributes, preedit_attr,
1578 XNStatusAttributes, status_attr, NULL); 1531 XNStatusAttributes, status_attr,
1532 NULL);
1579 1533
1534 XFree (status_attr);
1535 }
1536
1580 XFree (preedit_attr); 1537 XFree (preedit_attr);
1581 XFree (status_attr);
1582} 1538}
1583#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1540
1541void
1542rxvt_term::get_window_origin (int &x, int &y)
1543{
1544 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567}
1568
1569#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579
1580void
1581rxvt_term::update_background ()
1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1586 bgPixmap.invalidate ();
1587
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1589
1590 if (to_wait <= 0.)
1591 bgPixmap.render ();
1592 else
1593 update_background_ev.start (to_wait);
1594}
1595
1596void
1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1602 bgPixmap.render ();
1603 refresh_check ();
1604}
1605
1606#endif /* HAVE_BG_PIXMAP */
1584 1607
1585/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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