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

Diff Legend

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