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.194 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.311 by root, Tue Nov 4 13:28:40 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 164#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 167#endif
163#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 170#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 180#endif
169#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 183#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 184#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 186#endif
178 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 194
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 196
189 termlist.push_back (this); 197 termlist.push_back (this);
190 198
191#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
212 pty_ev.stop ();
203 delete pty; pty = 0; 213 delete pty; pty = 0;
204} 214}
205 215
206rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
207{ 217{
… …
214 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
215 delete fontset[i]; 225 delete fontset[i];
216#endif 226#endif
217 delete fontset[0]; 227 delete fontset[0];
218 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#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, stringvec *envv)
456{
457 this->envv = envv;
458
459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
462
463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = rxvt_new_ptytty ();
480
481 create_windows (argc, argv);
482
483 dDisp;
484
485 init_xlocale ();
486
487 scr_reset (); // initialize screen
488
489#if 0
490 XSynchronize (disp, True);
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */
496#endif
497#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent))
499 {
500 XSelectInput (disp, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root);
503 }
504#endif
505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
522 return true;
523}
524
525static struct sig_handlers 452static struct sig_handlers
526{ 453{
527 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
528 455
529 /* 456 /*
530 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
531 */ 458 */
532 void 459 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 460
461 sig_handlers ()
534 { 462 {
535#ifdef DEBUG_CMD 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
546 {
547 } 465 }
548} sig_handlers; 466} sig_handlers;
549 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
550char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
551 477
552void 478void
553rxvt_init () 479rxvt_init ()
554{ 480{
555 uid_t uid = getuid (); 481 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 rxvt_ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568 482
569 // drop privileges 483 if (!ev_default_loop (0))
570#if HAVE_SETRESUID 484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 485
586 rxvt_environ = environ; 486 rxvt_environ = environ;
587 487
588 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
590 490
591 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
592 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
593 493
594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
595 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
596 496
597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
599 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
600 500
601 XrmInitialize (); 501 XrmInitialize ();
602} 502}
603 503
604/* ------------------------------------------------------------------------- *
605 * MEMORY ALLOCATION WRAPPERS *
606 * ------------------------------------------------------------------------- */
607void *
608rxvt_malloc (size_t size)
609{
610 void *p = malloc (size);
611
612 if (!p)
613 rxvt_fatal ("memory allocation failure. aborting.\n");
614
615 return p;
616}
617
618void *
619rxvt_calloc (size_t number, size_t size)
620{
621 void *p = calloc (number, size);
622
623 if (!p)
624 rxvt_fatal ("memory allocation failure. aborting.\n");
625
626 return p;
627}
628
629void *
630rxvt_realloc (void *ptr, size_t size)
631{
632 void *p = realloc (ptr, size);
633
634 if (!p)
635 rxvt_fatal ("memory allocation failure. aborting.\n");
636
637 return p;
638}
639
640/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
641/* 505/*
642 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
643 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
644 */ 508 */
645void 509void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 511{
648 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 513 int x, y, flags;
650 unsigned int w, h; 514 unsigned int w, h;
651 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 516
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 519 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 520
… …
668 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 530
671 if (flags & WidthValue) 531 if (flags & WidthValue)
672 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 537 szHint.flags |= USSize;
675 } 538 }
676 539
677 if (flags & HeightValue) 540 if (flags & HeightValue)
678 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 546 szHint.flags |= USSize;
681 } 547 }
682 548
683 if (flags & XValue) 549 if (flags & XValue)
684 { 550 {
… …
715 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
717 583
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 585
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
722 587
723 if (scrollBar.state) 588 if (scrollBar.state)
724 { 589 {
725 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
592
727 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 594 window_vt_x += sb_w;
729 } 595 }
730 596
731 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
735 601
736 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 603 {
738 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
753 { 619 {
754 min_it (height, max_height); 620 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
756 } 622 }
757 623
758 if (scrollBar.state && OPTION (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760
761 if (recalc_x) 624 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626
763 if (recalc_y) 627 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 629
766 ncol = width / fwidth; 630 ncol = width / fwidth;
767 nrow = height / fheight; 631 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 632}
773 633
774/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
775/* 635/*
776 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
… …
789 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
790 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
792 652
793#if 0 653#if 0
794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
795 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
796 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
797#endif 657#endif
798} 658}
799 659
… …
828 delete fontset[0]; 688 delete fontset[0];
829 fontset[0] = fs; 689 fontset[0] = fs;
830 690
831 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
832 prop.height += lineSpace; 692 prop.height += lineSpace;
693
833 fs->set_prop (prop); 694 fs->set_prop (prop, false);
834 695
835 fwidth = prop.width; 696 fwidth = prop.width;
836 fheight = prop.height; 697 fheight = prop.height;
837 fbase = prop.ascent; 698 fbase = prop.ascent;
838 699
… …
847 { 708 {
848 fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
849 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
850 711
851 if (res) 712 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
853 else 717 else
854 { 718 {
855 res = fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
856 720
857 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;
858 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);
859 } 725 }
860 726
861 fs->populate (res);
862 fs->set_prop (prop2);
863 } 727 }
864#else 728#else
865 fontset[style] = fontset[0]; 729 fontset[style] = fontset[0];
866#endif 730#endif
867 } 731 }
… …
869 if (parent[0]) 733 if (parent[0])
870 { 734 {
871 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 736 scr_remap_chars ();
873 scr_touch (true); 737 scr_touch (true);
874 } 738 }
875 739
876 return true; 740 return true;
877} 741}
878 742
743void
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 745{
881 XChangeProperty (display->display, parent[0], 746 XChangeProperty (dpy, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 749}
885 750
751void
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 753{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
890 756
891 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 759 (const unsigned char *)s, strlen (s));
894 760
895 free (s); 761 free (s);
896 free (ws); 762 free (ws);
… …
915#if ENABLE_EWMH 781#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 783#endif
918} 784}
919 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
920#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
921void
922rxvt_term::set_window_color (int idx, const char *color)
923{
924 rxvt_color xcol; 790 rxvt_color xcol;
925 int i;
926 791
927 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
928 return; 793 return;
929 794
795 color = strdup (color);
796 allocated.push_back ((void *)color);
797 rs[Rs_color + idx] = color;
798
930 /* handle color aliases */ 799 /* handle color aliases */
931 if (isdigit (*color)) 800 if (isdigit (*color))
932 { 801 {
933 i = atoi (color); 802 int i = atoi (color);
934 803
935 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
936 { /* bright colors */ 806 /* bright colors */
937 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
939 SET_PIXCOLOR (idx);
940 goto done; 808 goto done;
941 } 809 }
942 810
943 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
944 { /* normal colors */ 813 /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 815 goto done;
948 } 816 }
949 } 817 }
950 818
951 if (!rXParseAllocColor (&xcol, color)) 819 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 820
956 /* 821 /*
957 * 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,
958 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
959 */ 824 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 825
972 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 827
975 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */
977done: 828done:
978
979#if OFF_FOCUS_FADING
980 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
982#endif
983
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
985 830
831 update_fade_color (idx);
986 recolour_cursor (); 832 recolour_cursor ();
987 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
988} 835}
989
990#else
991# define set_window_color (idx,color) ((void)0)
992#endif /* XTERM_COLOR_CHANGE */
993 836
994void 837void
995rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
996{ 839{
997 XColor xcol[2]; 840 XColor fg, bg;
998 841
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 842 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 843 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 844 : pix_colors_focused[Color_fg]).get (fg);
845
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 846 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 847 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 848 : pix_colors_focused[Color_bg]).get (bg);
1005 849
1006 XQueryColors (display->display, display->cmap, xcol, 2); 850 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 851}
1009 852
1010/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
1011/* 854/*
1012 * 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
1013 */ 856 */
1014void 857void
1015rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
1016{ 859{
1017 unsigned int i; 860 unsigned int i;
1018 const char *xpmb = "\0"; 861 const char *xpmb = "";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 863
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 867 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 868 {
… …
1030 872
1031 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
1033 { 875 {
1034 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1035#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1036 xpmb = "default;"; 878 xpmb = "default;";
1037#endif 879#endif
1038 break; 880 break;
1039 } 881 }
1040 882
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 884}
1043 885
1044/*----------------------------------------------------------------------*/ 886/*----------------------------------------------------------------------*/
1045 887
1046int 888bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 889rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 890{
1049 if (!screen_in_out->set (display, colour)) 891 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 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]);
1056} 902}
1057 903
1058/* -------------------------------------------------------------------- * 904/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 905 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 906 * -------------------------------------------------------------------- */
1061void 907void
1062rxvt_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)
1063{ 909{
1064 int fix_screen; 910 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 911 int old_width = szHint.width;
1066 dDisp; 912 int old_height = szHint.height;
1067 913
1068 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
915
916 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1069 XSetWMNormalHints (disp, parent[0], &szHint); 917 XSetWMNormalHints (dpy, parent[0], &szHint);
1070 918
1071 if (!ignoreparent) 919 if (!ignoreparent)
1072 { 920 {
1073#ifdef SMART_RESIZE 921#ifdef SMART_RESIZE
1074 /* 922 /*
… …
1078 int x, y, x1, y1; 926 int x, y, x1, y1;
1079 int dx, dy; 927 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 928 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 929 Window unused_cr;
1082 930
1083 XTranslateCoordinates (disp, parent[0], display->root, 931 XTranslateCoordinates (dpy, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 932 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 933 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 934 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 935 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 936 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 937 * our position for handles and decorations. Counter it
1090 */ 938 */
… …
1092 { 940 {
1093 x -= x1; 941 x -= x1;
1094 y -= y1; 942 y -= y1;
1095 } 943 }
1096 944
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 945 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 946 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 947 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 948 dy = old_height - szHint.height;
1101 949
1102 /* Check position of the center of the window */ 950 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 951 if (x < x1) /* left half */
1104 dx = 0; 952 dx = 0;
… …
1107 if (y < y1) /* top half */ 955 if (y < y1) /* top half */
1108 dy = 0; 956 dy = 0;
1109 else if (y == y1) /* exact center */ 957 else if (y == y1) /* exact center */
1110 dy /= 2; 958 dy /= 2;
1111 959
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 960 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 961 szHint.width, szHint.height);
1114#else 962#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 963 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1116#endif 964#endif
1117 } 965 }
1118 966
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 967 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 968
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 969 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 970 {
1123 if (scrollBar.state) 971 if (scrollBar.state)
1124 { 972 scrollBar.resize ();
1125 XMoveResizeWindow (disp, scrollBar.win,
1126 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar ();
1129 }
1130 973
1131 XMoveResizeWindow (disp, vt, 974 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 975 window_vt_x, window_vt_y,
1133 width, height); 976 width, height);
1134 977
978#ifdef HAVE_BG_PIXMAP
979 if (bgPixmap.window_size_sensitive ())
980 update_background ();
981#endif
982
1135 scr_clear (); 983 scr_clear ();
1136#ifdef XPM_BACKGROUND
1137 resize_pixmap ();
1138#endif
1139 } 984 }
1140 985
1141 if (fix_screen || old_height == 0) 986 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 987 scr_reset ();
1156 988
1157 if (curr_screen >= 0) /* this is not the first time through */ 989 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 990 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163 991
1164 old_width = szHint.width; 992#ifdef HAVE_BG_PIXMAP
1165 old_height = szHint.height; 993// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1166 994// if (bgPixmap.pixmap)
1167#ifdef XPM_BACKGROUND
1168 if (pixmap)
1169 scr_touch (false); 995// scr_touch (false);
1170#endif 996#endif
1171 997
1172#ifdef USE_XIM 998#ifdef USE_XIM
1173 IMSetStatusPosition (); 999 IMSetPosition ();
1174#endif 1000#endif
1175} 1001}
1176 1002
1177/* 1003/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1004 * Set the width/height of the vt window in characters. Units are pixels.
… …
1183{ 1009{
1184 XWindowAttributes wattr; 1010 XWindowAttributes wattr;
1185 1011
1186 if (newwidth == 0 || newheight == 0) 1012 if (newwidth == 0 || newheight == 0)
1187 { 1013 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1014 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1015
1190 if (newwidth == 0) 1016 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1017 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1018 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1019 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1033#ifdef USE_XIM
1208 1034
1209void 1035void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1036rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1037{
1212 fg = pix_colors[Color_fg]; 1038 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1039 bg = pix_colors [Color_bg];
1214} 1040}
1215 1041
1216void 1042void
1217rxvt_term::im_set_size (XRectangle &size) 1043rxvt_term::im_set_size (XRectangle &size)
1218{ 1044{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1081 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1082
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1083 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1084 *p = '\0';
1259 1085
1260 atom = XInternAtom (display->display, server, False); 1086 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1087 win = XGetSelectionOwner (dpy, atom);
1262 1088
1263 if (win != None) 1089 if (win != None)
1264 return True; 1090 return True;
1265 } 1091 }
1266 1092
… …
1273 XPoint nspot; 1099 XPoint nspot;
1274 XVaNestedList preedit_attr; 1100 XVaNestedList preedit_attr;
1275 1101
1276 if (!Input_Context 1102 if (!Input_Context
1277 || !focus 1103 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1104 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1105 return;
1280 1106
1281 im_set_position (nspot); 1107 im_set_position (nspot);
1282 1108
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1109 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1128 input_method = 0;
1303 } 1129 }
1304 1130
1305 Input_Context = 0; 1131 Input_Context = 0;
1306} 1132}
1133
1134#ifdef ENABLE_XIM_ONTHESPOT
1135
1136static void
1137xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1138{
1139 ((rxvt_term *)client_data)->make_current ();
1140 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1141}
1142
1143static void
1144xim_preedit_done (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_DONE, DT_END));
1148}
1149
1150static void
1151xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1152{
1153 rxvt_term *term = (rxvt_term *)client_data;
1154 XIMText *text = call_data->text;
1155
1156 term->make_current ();
1157
1158 if (text)
1159 {
1160 void *str;
1161
1162 if (!text->encoding_is_wchar && text->string.multi_byte)
1163 {
1164 // of course, X makes it ugly again
1165 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->rs[Rs_imLocale]);
1167
1168 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1169 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1170
1171 if (term->rs[Rs_imLocale])
1172 SET_LOCALE (term->locale);
1173 }
1174 else
1175 str = (void *)text->string.wide_char;
1176
1177 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1178 DT_INT, call_data->caret,
1179 DT_INT, call_data->chg_first,
1180 DT_INT, call_data->chg_length,
1181 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1182 DT_WCS_LEN, str, str ? (int)text->length : 0,
1183 DT_END));
1184 }
1185 else
1186 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1187 DT_INT, call_data->caret,
1188 DT_INT, call_data->chg_first,
1189 DT_INT, call_data->chg_length,
1190 DT_END));
1191}
1192
1193#if 0
1194static void
1195xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1196{
1197 ((rxvt_term *)client_data)->make_current ();
1198 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1199 DT_INT, call_data->position,
1200 DT_INT, call_data->direction,
1201 DT_INT, call_data->style,
1202 DT_END));
1203}
1204#endif
1205
1206#endif
1307 1207
1308/* 1208/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1209 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1210 * open a suitable preedit type
1311 */ 1211 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1218 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1219 unsigned long fg, bg;
1320 const char *p; 1220 const char *p;
1321 char **s; 1221 char **s;
1322 XIMStyles *xim_styles; 1222 XIMStyles *xim_styles;
1223#ifdef ENABLE_XIM_ONTHESPOT
1224 XIMCallback xcb[4];
1225#endif
1323 1226
1324 set_environ (envv); 1227 set_environ (envv);
1325 1228
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1229 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1230 return false;
1328 1231
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1232 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1233 if (input_method == NULL)
1332 return false; 1234 return false;
1333 1235
1334 xim = input_method->xim; 1236 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1256 s = rxvt_splitcommastring (p);
1355 1257
1356 for (i = found = 0; !found && s[i]; i++) 1258 for (i = found = 0; !found && s[i]; i++)
1357 { 1259 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1260 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1261 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1262 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1263 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1264 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1265 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1266 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1267 input_style = XIMPreeditNone | XIMStatusNone;
1268#ifdef ENABLE_XIM_ONTHESPOT
1269 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1270 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1271#endif
1272 else
1273 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1274
1367 for (j = 0; j < xim_styles->count_styles; j++) 1275 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1276 if (input_style == xim_styles->supported_styles[j])
1369 { 1277 {
1370 rxvt_freecommastring (s); 1278 rxvt_freecommastring (s);
… …
1408 "*", 1316 "*",
1409 fheight, 1317 fheight,
1410 fheight + 1, fheight - 1, 1318 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1319 fheight - 2, fheight + 2);
1412 1320
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1321 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1322 &missing_charset_list, &missing_charset_count, &def_string);
1415 1323
1416 if (missing_charset_list) 1324 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1325 XFreeStringList (missing_charset_list);
1418 1326
… …
1459 XNBackground, bg, 1367 XNBackground, bg,
1460 XNArea, &status_rect, 1368 XNArea, &status_rect,
1461 XNFontSet, fs, 1369 XNFontSet, fs,
1462 NULL); 1370 NULL);
1463 } 1371 }
1372#if ENABLE_XIM_ONTHESPOT
1373 else if (input_style & XIMPreeditCallbacks)
1374 {
1375 im_set_position (spot);
1376
1377 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1378 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1379 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1380# if 0
1381 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1382# endif
1383
1384 preedit_attr = XVaCreateNestedList (0,
1385 XNSpotLocation, &spot,
1386 XNPreeditStartCallback, &xcb[0],
1387 XNPreeditDoneCallback , &xcb[1],
1388 XNPreeditDrawCallback , &xcb[2],
1389# if 0
1390 XNPreeditCaretCallback, &xcb[3],
1391# endif
1392 NULL);
1393 }
1394#endif
1464 1395
1465 Input_Context = XCreateIC (xim, 1396 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1397 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1398 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1399 XNFocusWindow, parent[0],
… …
1470 preedit_attr, 1401 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1402 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1403 status_attr, NULL);
1473 1404
1474 if (preedit_attr) XFree (preedit_attr); 1405 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1406 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1407 if (fs) XFreeFontSet (dpy, fs);
1477 1408
1478 if (Input_Context == NULL) 1409 if (Input_Context == NULL)
1479 { 1410 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1411 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1412 im_destroy ();
1482 return false; 1413 return false;
1483 } 1414 }
1484 1415
1485 if (input_style & XIMPreeditArea) 1416#if 0
1417 // unfortunately, only the focus window is used by XIM, hard to fix
1418 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1419 vt_select_input ();
1420#endif
1421
1486 IMSetStatusPosition (); 1422 IMSetPosition ();
1487 1423
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1424 return true;
1490} 1425}
1491 1426
1492void 1427void
1493rxvt_term::im_cb () 1428rxvt_term::im_cb ()
… …
1499 1434
1500 make_current (); 1435 make_current ();
1501 1436
1502 im_destroy (); 1437 im_destroy ();
1503 1438
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1439 if (Input_Context)
1506 return; 1440 return;
1507 1441
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1442#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1443 if (rs[Rs_imLocale])
… …
1551 SET_LOCALE (locale); 1485 SET_LOCALE (locale);
1552#endif 1486#endif
1553} 1487}
1554 1488
1555void 1489void
1556rxvt_term::IMSetStatusPosition () 1490rxvt_term::IMSetPosition ()
1557{ 1491{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1492 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1493 XVaNestedList preedit_attr, status_attr;
1560 1494
1561 if (!Input_Context 1495 if (!Input_Context
1562 || !focus 1496 || !focus
1563 || !(input_style & XIMPreeditArea) 1497 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1498 || !IMisRunning ())
1565 return; 1499 return;
1566 1500
1501 if (input_style & XIMPreeditPosition)
1502 {
1503 im_set_size (preedit_rect);
1504 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1505
1506 XSetICValues (Input_Context,
1507 XNPreeditAttributes, preedit_attr, NULL);
1508 }
1509 else
1510 {
1567 /* Getting the necessary width of preedit area */ 1511 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1512 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1513 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1514 XFree (status_attr);
1571 1515
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1516 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1517 XFree (needed_rect);
1574 1518
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1519 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1520 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1521
1578 XSetICValues (Input_Context, 1522 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1523 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1524 XNStatusAttributes, status_attr,
1525 NULL);
1581 1526
1527 XFree (status_attr);
1528 }
1529
1582 XFree (preedit_attr); 1530 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1531}
1585#endif /* USE_XIM */ 1532#endif /* USE_XIM */
1533
1534void
1535rxvt_term::get_window_origin (int &x, int &y)
1536{
1537 Window cr;
1538 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1539/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1540}
1541
1542Pixmap
1543rxvt_term::get_pixmap_property (int prop_id)
1544{
1545 if (prop_id > 0 && prop_id < NUM_XA)
1546 if (xa[prop_id])
1547 {
1548 int aformat;
1549 unsigned long nitems, bytes_after;
1550 Atom atype;
1551 unsigned char *prop = NULL;
1552 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1553 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1554 &nitems, &bytes_after, &prop);
1555 if (result == Success && prop && atype == XA_PIXMAP)
1556 return *(Pixmap *)prop;
1557 }
1558
1559 return None;
1560}
1561
1562#ifdef HAVE_BG_PIXMAP
1563# if TRACE_PIXMAPS
1564# undef update_background
1565void
1566rxvt_term::trace_update_background (const char *file, int line)
1567{
1568 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1569 update_background ();
1570}
1571# endif
1572
1573void
1574rxvt_term::update_background ()
1575{
1576 if (update_background_ev.is_active ())
1577 return;
1578
1579 bgPixmap.invalidate ();
1580
1581 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1582
1583 if (to_wait <= 0.)
1584 bgPixmap.render ();
1585 else
1586 update_background_ev.start (to_wait);
1587}
1588
1589void
1590rxvt_term::update_background_cb (ev::timer &w, int revents)
1591{
1592 make_current ();
1593
1594 update_background_ev.stop ();
1595 bgPixmap.render ();
1596 refresh_check ();
1597}
1598
1599#endif /* HAVE_BG_PIXMAP */
1586 1600
1587/*----------------------- end-of-file (C source) -----------------------*/ 1601/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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