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.305 by ayin, Sun Feb 17 11:37:21 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 164#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 167#endif
163#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 170#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 180#endif
169#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 183#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 184#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 186#endif
178 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 194
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 196
189 termlist.push_back (this); 197 termlist.push_back (this);
190 198
191#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
212 pty_ev.stop ();
203 delete pty; pty = 0; 213 delete pty; pty = 0;
204} 214}
205 215
206rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
207{ 217{
… …
214 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
215 delete fontset[i]; 225 delete fontset[i];
216#endif 226#endif
217 delete fontset[0]; 227 delete fontset[0];
218 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
219 if (display) 233 if (display)
220 { 234 {
221 dDisp;
222
223 selection_clear (); 235 selection_clear ();
224 236
225#ifdef USE_XIM 237#ifdef USE_XIM
226 im_destroy (); 238 im_destroy ();
227#endif 239#endif
228#ifdef XTERM_SCROLLBAR 240#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 243#endif
232#ifdef PLAIN_SCROLLBAR 244#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 246#endif
235#ifdef NEXT_SCROLLBAR 247#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 248 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 249 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 250 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 251 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 252 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 253 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 254 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 255 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 258#endif
247#ifdef RXVT_SCROLLBAR 259#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 263#endif
252 if (gc) XFreeGC (disp, gc); 264 if (gc) XFreeGC (dpy, gc);
253 265
254 delete drawable; 266 delete drawable;
255 // destroy all windows 267 // destroy all windows
256 if (parent[0]) 268 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 269 XDestroyWindow (dpy, parent[0]);
258 }
259 270
260 // TODO: free pixcolours, colours should become part of rxvt_display 271 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 272 if (ISSET_PIXCOLOR (i))
273 {
274 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 276 pix_colors_unfocused [i].free (this);
264#endif 277#endif
278 }
265 279
280 clear ();
281
282 display->flush (); /* ideally .put should do this */
266 displays.put (display); 283 displays.put (display);
284 }
267 285
268 scr_release (); 286 scr_release ();
269 287
270 /* clear all resources */ 288 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 290 free (allocated [i]);
273 291
274 free (selection.text); 292 free (selection.text);
275 // TODO: manage env vars in child only(!) 293 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 294 free (env_display);
278 free (env_term); 295 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 296 free (locale);
281 free (v_buffer); 297 free (v_buffer);
282 free (incr_buf); 298 free (incr_buf);
283 299
284 delete envv; 300 delete envv;
285 delete argv; 301 delete argv;
286 302
287#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
288 delete keyboard; 304 delete keyboard;
289#endif 305#endif
306#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db);
308#endif
290} 309}
291 310
292// child has exited, usually destroys 311// child has exited, usually destroys
293void 312void
294rxvt_term::child_cb (child_watcher &w, int status) 313rxvt_term::child_cb (ev::child &w, int status)
295{ 314{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 315 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 316
298 cmd_pid = 0; 317 cmd_pid = 0;
299 318
300 if (!OPTION (Opt_hold)) 319 if (!option (Opt_hold))
301 destroy (); 320 destroy ();
302} 321}
303 322
304void 323void
305rxvt_term::destroy () 324rxvt_term::destroy ()
306{ 325{
307 if (destroy_ev.active) 326 if (destroy_ev.is_active ())
308 return; 327 return;
309 328
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 330
313#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
314 scr_overlay_off (); 332 scr_overlay_off ();
315#endif 333#endif
316 334
317 if (display) 335 if (display)
318 { 336 {
319#if USE_XIM 337#if USE_XIM
320 im_ev.stop (display); 338 im_ev.stop (display);
321#endif 339#endif
322#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
324#endif 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
325#if TRANSPARENT
326 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
327#endif 343#endif
328 incr_ev.stop (); 344 incr_ev.stop ();
329 termwin_ev.stop (display); 345 termwin_ev.stop (display);
330 vt_ev.stop (display); 346 vt_ev.stop (display);
331 } 347 }
332 348
333 check_ev.stop (); 349 flush_ev.stop ();
334 pty_ev.stop (); 350 pty_ev.stop ();
335#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
337#endif 353#endif
338#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
… …
346#endif 362#endif
347#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
348 pointer_ev.stop (); 364 pointer_ev.stop ();
349#endif 365#endif
350 366
351 destroy_ev.start (0); 367 destroy_ev.start ();
352} 368}
353 369
354void 370void
355rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 372{
357 make_current (); 373 make_current ();
358 374
359 delete this; 375 delete this;
360} 376}
… …
371{ 387{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
374} 390}
375 391
376#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
377static void 393static void
378print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
379{ 395{
380 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
… …
414 else 430 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 432 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 434 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 436 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 438}
423#endif 439#endif
424 440
… …
429 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
430 else 446 else
431 { 447 {
432 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 449 // so just output the error and continue
434#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
435 print_x_error (display, event); 453 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 454#endif
439 } 455 }
440 456
441 return 0; 457 return 0;
442} 458}
… …
448 DisplayString (display)); 464 DisplayString (display));
449 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
451} 467}
452 468
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{
457 this->envv = envv;
458
459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
462
463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = 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 469static struct sig_handlers
526{ 470{
527 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
528 472
529 /* 473 /*
530 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
531 */ 475 */
532 void 476 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 477
478 sig_handlers ()
534 { 479 {
535#ifdef DEBUG_CMD 480 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) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
546 {
547 } 482 }
548} sig_handlers; 483} sig_handlers;
549 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
550char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
551 494
552void 495void
553rxvt_init () 496rxvt_init ()
554{ 497{
555 uid_t uid = getuid (); 498 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 499
569 // drop privileges 500 if (!ev_default_loop (0))
570#if HAVE_SETRESUID 501 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 502
586 rxvt_environ = environ; 503 rxvt_environ = environ;
587 504
588 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
590 507
591 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
592 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
593 510
594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
595 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
596 513
597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
599 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
600 517
601 XrmInitialize (); 518 XrmInitialize ();
602} 519}
603 520
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/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
641/* 522/*
642 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
643 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
644 */ 525 */
645void 526void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 528{
648 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 530 int x, y, sb_w, flags;
650 unsigned int w, h; 531 unsigned int w, h;
651 unsigned int max_width, max_height; 532 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 533
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 536 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 537
… …
720 sb_w = 0; 597 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 598 window_vt_x = window_vt_y = int_bwidth;
722 599
723 if (scrollBar.state) 600 if (scrollBar.state)
724 { 601 {
725 sb_w = scrollbar_TotalWidth (); 602 sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
604
727 if (!OPTION (Opt_scrollBar_right)) 605 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 606 window_vt_x += sb_w;
729 } 607 }
730 608
731 szHint.width_inc = fwidth; 609 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 610 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 611 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 612 szHint.min_height = szHint.base_height + szHint.height_inc;
735 613
736 if (newwidth && newwidth - szHint.base_width < max_width) 614 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 615 {
738 szHint.width = newwidth; 616 szHint.width = newwidth;
… …
753 { 631 {
754 min_it (height, max_height); 632 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 633 szHint.height = szHint.base_height + height;
756 } 634 }
757 635
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 636 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 637 window_sb_x = szHint.width - sb_w;
760 638
761 if (recalc_x) 639 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641
763 if (recalc_y) 642 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 644
766 ncol = width / fwidth; 645 ncol = width / fwidth;
767 nrow = height / fheight; 646 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} 647}
773 648
774/*----------------------------------------------------------------------*/ 649/*----------------------------------------------------------------------*/
775/* 650/*
776 * Tell the teletype handler what size the window is. 651 * Tell the teletype handler what size the window is.
… …
789 ws.ws_xpixel = width; 664 ws.ws_xpixel = width;
790 ws.ws_ypixel = height; 665 ws.ws_ypixel = height;
791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
792 667
793#if 0 668#if 0
794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 669 // TIOCSWINSZ is supposed to do this automatically and correctly
795 if (cmd_pid) /* force through to the command */ 670 if (cmd_pid) /* force through to the command */
796 kill (-cmd_pid, SIGWINCH); 671 kill (-cmd_pid, SIGWINCH);
797#endif 672#endif
798} 673}
799 674
… …
828 delete fontset[0]; 703 delete fontset[0];
829 fontset[0] = fs; 704 fontset[0] = fs;
830 705
831 prop = (*fs)[1]->properties (); 706 prop = (*fs)[1]->properties ();
832 prop.height += lineSpace; 707 prop.height += lineSpace;
708
833 fs->set_prop (prop); 709 fs->set_prop (prop, false);
834 710
835 fwidth = prop.width; 711 fwidth = prop.width;
836 fheight = prop.height; 712 fheight = prop.height;
837 fbase = prop.ascent; 713 fbase = prop.ascent;
838 714
… …
847 { 723 {
848 fontset[style] = fs = new rxvt_fontset (this); 724 fontset[style] = fs = new rxvt_fontset (this);
849 rxvt_fontprop prop2 = prop; 725 rxvt_fontprop prop2 = prop;
850 726
851 if (res) 727 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset; 728 {
729 fs->populate (res);
730 fs->set_prop (prop2, false);
731 }
853 else 732 else
854 { 733 {
855 res = fontset[0]->fontdesc; 734 fs->populate (fontset[0]->fontdesc);
856 735
857 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 736 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; 737 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
738
739 fs->set_prop (prop2, true);
859 } 740 }
860 741
861 fs->populate (res);
862 fs->set_prop (prop2);
863 } 742 }
864#else 743#else
865 fontset[style] = fontset[0]; 744 fontset[style] = fontset[0];
866#endif 745#endif
867 } 746 }
… …
869 if (parent[0]) 748 if (parent[0])
870 { 749 {
871 resize_all_windows (0, 0, 0); 750 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 751 scr_remap_chars ();
873 scr_touch (true); 752 scr_touch (true);
874 } 753 }
875 754
876 return true; 755 return true;
877} 756}
878 757
758void
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 759rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 760{
881 XChangeProperty (display->display, parent[0], 761 XChangeProperty (dpy, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 762 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 763 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 764}
885 765
766void
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 767rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 768{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 769 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 770 char *s = rxvt_wcstoutf8 (ws);
890 771
891 XChangeProperty (display->display, parent[0], 772 XChangeProperty (dpy, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 774 (const unsigned char *)s, strlen (s));
894 775
895 free (s); 776 free (s);
896 free (ws); 777 free (ws);
… …
915#if ENABLE_EWMH 796#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 798#endif
918} 799}
919 800
801void
802rxvt_term::set_window_color (int idx, const char *color)
803{
920#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
921void
922rxvt_term::set_window_color (int idx, const char *color)
923{
924 rxvt_color xcol; 805 rxvt_color xcol;
925 int i;
926 806
927 if (color == NULL || *color == '\0') 807 if (color == NULL || *color == '\0')
928 return; 808 return;
929 809
810 color = strdup (color);
811 allocated.push_back ((void *)color);
812 rs[Rs_color + idx] = color;
813
930 /* handle color aliases */ 814 /* handle color aliases */
931 if (isdigit (*color)) 815 if (isdigit (*color))
932 { 816 {
933 i = atoi (color); 817 int i = atoi (color);
934 818
935 if (i >= 8 && i <= 15) 819 if (i >= 8 && i <= 15)
820 {
936 { /* bright colors */ 821 /* bright colors */
937 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 822 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
939 SET_PIXCOLOR (idx);
940 goto done; 823 goto done;
941 } 824 }
942 825
943 if (i >= 0 && i <= 7) 826 if (i >= 0 && i <= 7)
827 {
944 { /* normal colors */ 828 /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 829 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 830 goto done;
948 } 831 }
949 } 832 }
950 833
951 if (!rXParseAllocColor (&xcol, color)) 834 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 835
956 /* 836 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 837 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 838 * so just keep gobbling up the colormap
959 */ 839 */
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 840
972 pix_colors_focused[idx] = xcol; 841 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 842
975 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */
977done: 843done:
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. */ 844 /*TODO: handle Color_BD, scrollbar background, etc. */
985 845
846 update_fade_color (idx);
986 recolour_cursor (); 847 recolour_cursor ();
987 scr_recolour (); 848 scr_recolour ();
849#endif /* XTERM_COLOR_CHANGE */
988} 850}
989
990#else
991# define set_window_color (idx,color) ((void)0)
992#endif /* XTERM_COLOR_CHANGE */
993 851
994void 852void
995rxvt_term::recolour_cursor () 853rxvt_term::recolour_cursor ()
996{ 854{
997 XColor xcol[2]; 855 XColor fg, bg;
998 856
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 857 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 858 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 859 : pix_colors_focused[Color_fg]).get (fg);
860
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 861 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 862 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 863 : pix_colors_focused[Color_bg]).get (bg);
1005 864
1006 XQueryColors (display->display, display->cmap, xcol, 2); 865 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 866}
1009 867
1010/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
1011/* 869/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 870 * find if fg/bg matches any of the normal (low-intensity) colors
1013 */ 871 */
1014void 872void
1015rxvt_term::set_colorfgbg () 873rxvt_term::set_colorfgbg ()
1016{ 874{
1017 unsigned int i; 875 unsigned int i;
1018 const char *xpmb = "\0"; 876 const char *xpmb = "";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 877 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 878
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 879 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 880 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 881 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 882 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 883 {
… …
1030 887
1031 for (i = Color_Black; i <= Color_White; i++) 888 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_bg] == pix_colors[i]) 889 if (pix_colors[Color_bg] == pix_colors[i])
1033 { 890 {
1034 sprintf (bstr, "%d", (i - Color_Black)); 891 sprintf (bstr, "%d", (i - Color_Black));
1035#ifdef XPM_BACKGROUND 892#ifdef BG_IMAGE_FROM_FILE
1036 xpmb = "default;"; 893 xpmb = "default;";
1037#endif 894#endif
1038 break; 895 break;
1039 } 896 }
1040 897
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 898 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 899}
1043 900
1044/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
1045 902
1046int 903bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 904rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 905{
1049 if (!screen_in_out->set (display, colour)) 906 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; 907 return true;
908
909 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
910 return false;
911}
912
913void
914rxvt_term::alias_color (int dst, int src)
915{
916 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 917}
1057 918
1058/* -------------------------------------------------------------------- * 919/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 920 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 921 * -------------------------------------------------------------------- */
1061void 922void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 923rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 924{
1064 int fix_screen; 925 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 926 int old_width = szHint.width;
1066 dDisp; 927 int old_height = szHint.height;
1067 928
1068 window_calc (newwidth, newheight); 929 window_calc (newwidth, newheight);
930
931 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1069 XSetWMNormalHints (disp, parent[0], &szHint); 932 XSetWMNormalHints (dpy, parent[0], &szHint);
1070 933
1071 if (!ignoreparent) 934 if (!ignoreparent)
1072 { 935 {
1073#ifdef SMART_RESIZE 936#ifdef SMART_RESIZE
1074 /* 937 /*
… …
1078 int x, y, x1, y1; 941 int x, y, x1, y1;
1079 int dx, dy; 942 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 943 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 944 Window unused_cr;
1082 945
1083 XTranslateCoordinates (disp, parent[0], display->root, 946 XTranslateCoordinates (dpy, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 947 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 948 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 949 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 950 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 951 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 952 * our position for handles and decorations. Counter it
1090 */ 953 */
… …
1092 { 955 {
1093 x -= x1; 956 x -= x1;
1094 y -= y1; 957 y -= y1;
1095 } 958 }
1096 959
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 960 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 961 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 962 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 963 dy = old_height - szHint.height;
1101 964
1102 /* Check position of the center of the window */ 965 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 966 if (x < x1) /* left half */
1104 dx = 0; 967 dx = 0;
… …
1107 if (y < y1) /* top half */ 970 if (y < y1) /* top half */
1108 dy = 0; 971 dy = 0;
1109 else if (y == y1) /* exact center */ 972 else if (y == y1) /* exact center */
1110 dy /= 2; 973 dy /= 2;
1111 974
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 975 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 976 szHint.width, szHint.height);
1114#else 977#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 978 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1116#endif 979#endif
1117 } 980 }
1118 981
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 982 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 983
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 984 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 985 {
1123 if (scrollBar.state) 986 if (scrollBar.state)
1124 { 987 {
1125 XMoveResizeWindow (disp, scrollBar.win, 988 XMoveResizeWindow (dpy, scrollBar.win,
1126 window_sb_x, 0, 989 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 990 scrollBar.total_width (), szHint.height);
1128 resize_scrollbar (); 991 resize_scrollbar ();
1129 } 992 }
1130 993
1131 XMoveResizeWindow (disp, vt, 994 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 995 window_vt_x, window_vt_y,
1133 width, height); 996 width, height);
1134 997
998#ifdef HAVE_BG_PIXMAP
999 if (bgPixmap.window_size_sensitive ())
1000 update_background ();
1001#endif
1002
1135 scr_clear (); 1003 scr_clear ();
1136#ifdef XPM_BACKGROUND
1137 resize_pixmap ();
1138#endif
1139 } 1004 }
1140 1005
1141 if (fix_screen || old_height == 0) 1006 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 (); 1007 scr_reset ();
1156 1008
1157 if (curr_screen >= 0) /* this is not the first time through */ 1009 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 1010 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163 1011
1164 old_width = szHint.width; 1012#ifdef HAVE_BG_PIXMAP
1165 old_height = szHint.height; 1013// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1166 1014// if (bgPixmap.pixmap)
1167#ifdef XPM_BACKGROUND
1168 if (pixmap)
1169 scr_touch (false); 1015// scr_touch (false);
1170#endif 1016#endif
1171 1017
1172#ifdef USE_XIM 1018#ifdef USE_XIM
1173 IMSetStatusPosition (); 1019 IMSetPosition ();
1174#endif 1020#endif
1175} 1021}
1176 1022
1177/* 1023/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1024 * Set the width/height of the vt window in characters. Units are pixels.
… …
1183{ 1029{
1184 XWindowAttributes wattr; 1030 XWindowAttributes wattr;
1185 1031
1186 if (newwidth == 0 || newheight == 0) 1032 if (newwidth == 0 || newheight == 0)
1187 { 1033 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1034 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1035
1190 if (newwidth == 0) 1036 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1037 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1038 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1039 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1053#ifdef USE_XIM
1208 1054
1209void 1055void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1056rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1057{
1212 fg = pix_colors[Color_fg]; 1058 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1059 bg = pix_colors [Color_bg];
1214} 1060}
1215 1061
1216void 1062void
1217rxvt_term::im_set_size (XRectangle &size) 1063rxvt_term::im_set_size (XRectangle &size)
1218{ 1064{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1102
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1103 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1104 *p = '\0';
1259 1105
1260 atom = XInternAtom (display->display, server, False); 1106 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1262 1108
1263 if (win != None) 1109 if (win != None)
1264 return True; 1110 return True;
1265 } 1111 }
1266 1112
… …
1273 XPoint nspot; 1119 XPoint nspot;
1274 XVaNestedList preedit_attr; 1120 XVaNestedList preedit_attr;
1275 1121
1276 if (!Input_Context 1122 if (!Input_Context
1277 || !focus 1123 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1124 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1125 return;
1280 1126
1281 im_set_position (nspot); 1127 im_set_position (nspot);
1282 1128
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1129 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1148 input_method = 0;
1303 } 1149 }
1304 1150
1305 Input_Context = 0; 1151 Input_Context = 0;
1306} 1152}
1153
1154#ifdef ENABLE_XIM_ONTHESPOT
1155
1156static void
1157xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1158{
1159 ((rxvt_term *)client_data)->make_current ();
1160 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1161}
1162
1163static void
1164xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1165{
1166 ((rxvt_term *)client_data)->make_current ();
1167 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1168}
1169
1170static void
1171xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1172{
1173 rxvt_term *term = (rxvt_term *)client_data;
1174 XIMText *text = call_data->text;
1175
1176 term->make_current ();
1177
1178 if (text)
1179 {
1180 void *str;
1181
1182 if (!text->encoding_is_wchar && text->string.multi_byte)
1183 {
1184 // of course, X makes it ugly again
1185 if (term->rs[Rs_imLocale])
1186 SET_LOCALE (term->rs[Rs_imLocale]);
1187
1188 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1189 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1190
1191 if (term->rs[Rs_imLocale])
1192 SET_LOCALE (term->locale);
1193 }
1194 else
1195 str = (void *)text->string.wide_char;
1196
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length,
1201 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1202 DT_WCS_LEN, str, str ? (int)text->length : 0,
1203 DT_END));
1204 }
1205 else
1206 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1207 DT_INT, call_data->caret,
1208 DT_INT, call_data->chg_first,
1209 DT_INT, call_data->chg_length,
1210 DT_END));
1211}
1212
1213#if 0
1214static void
1215xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1216{
1217 ((rxvt_term *)client_data)->make_current ();
1218 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1219 DT_INT, call_data->position,
1220 DT_INT, call_data->direction,
1221 DT_INT, call_data->style,
1222 DT_END));
1223}
1224#endif
1225
1226#endif
1307 1227
1308/* 1228/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1229 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1230 * open a suitable preedit type
1311 */ 1231 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1238 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1239 unsigned long fg, bg;
1320 const char *p; 1240 const char *p;
1321 char **s; 1241 char **s;
1322 XIMStyles *xim_styles; 1242 XIMStyles *xim_styles;
1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1323 1246
1324 set_environ (envv); 1247 set_environ (envv);
1325 1248
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1250 return false;
1328 1251
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1252 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1253 if (input_method == NULL)
1332 return false; 1254 return false;
1333 1255
1334 xim = input_method->xim; 1256 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1276 s = rxvt_splitcommastring (p);
1355 1277
1356 for (i = found = 0; !found && s[i]; i++) 1278 for (i = found = 0; !found && s[i]; i++)
1357 { 1279 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1280 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1281 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1282 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1283 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1284 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1285 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1286 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1287 input_style = XIMPreeditNone | XIMStatusNone;
1288#ifdef ENABLE_XIM_ONTHESPOT
1289 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1290 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1291#endif
1292 else
1293 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1294
1367 for (j = 0; j < xim_styles->count_styles; j++) 1295 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1296 if (input_style == xim_styles->supported_styles[j])
1369 { 1297 {
1370 rxvt_freecommastring (s); 1298 rxvt_freecommastring (s);
… …
1408 "*", 1336 "*",
1409 fheight, 1337 fheight,
1410 fheight + 1, fheight - 1, 1338 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1339 fheight - 2, fheight + 2);
1412 1340
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1341 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1342 &missing_charset_list, &missing_charset_count, &def_string);
1415 1343
1416 if (missing_charset_list) 1344 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1345 XFreeStringList (missing_charset_list);
1418 1346
… …
1459 XNBackground, bg, 1387 XNBackground, bg,
1460 XNArea, &status_rect, 1388 XNArea, &status_rect,
1461 XNFontSet, fs, 1389 XNFontSet, fs,
1462 NULL); 1390 NULL);
1463 } 1391 }
1392#if ENABLE_XIM_ONTHESPOT
1393 else if (input_style & XIMPreeditCallbacks)
1394 {
1395 im_set_position (spot);
1396
1397 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1398 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1399 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1400# if 0
1401 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1402# endif
1403
1404 preedit_attr = XVaCreateNestedList (0,
1405 XNSpotLocation, &spot,
1406 XNPreeditStartCallback, &xcb[0],
1407 XNPreeditDoneCallback , &xcb[1],
1408 XNPreeditDrawCallback , &xcb[2],
1409# if 0
1410 XNPreeditCaretCallback, &xcb[3],
1411# endif
1412 NULL);
1413 }
1414#endif
1464 1415
1465 Input_Context = XCreateIC (xim, 1416 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1417 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1418 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1419 XNFocusWindow, parent[0],
… …
1470 preedit_attr, 1421 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1422 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1423 status_attr, NULL);
1473 1424
1474 if (preedit_attr) XFree (preedit_attr); 1425 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1426 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1427 if (fs) XFreeFontSet (dpy, fs);
1477 1428
1478 if (Input_Context == NULL) 1429 if (Input_Context == NULL)
1479 { 1430 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1431 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1432 im_destroy ();
1482 return false; 1433 return false;
1483 } 1434 }
1484 1435
1485 if (input_style & XIMPreeditArea) 1436#if 0
1437 // unfortunately, only the focus window is used by XIM, hard to fix
1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439 vt_select_input ();
1440#endif
1441
1486 IMSetStatusPosition (); 1442 IMSetPosition ();
1487 1443
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1444 return true;
1490} 1445}
1491 1446
1492void 1447void
1493rxvt_term::im_cb () 1448rxvt_term::im_cb ()
… …
1499 1454
1500 make_current (); 1455 make_current ();
1501 1456
1502 im_destroy (); 1457 im_destroy ();
1503 1458
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1459 if (Input_Context)
1506 return; 1460 return;
1507 1461
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1463 if (rs[Rs_imLocale])
… …
1551 SET_LOCALE (locale); 1505 SET_LOCALE (locale);
1552#endif 1506#endif
1553} 1507}
1554 1508
1555void 1509void
1556rxvt_term::IMSetStatusPosition () 1510rxvt_term::IMSetPosition ()
1557{ 1511{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1512 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1513 XVaNestedList preedit_attr, status_attr;
1560 1514
1561 if (!Input_Context 1515 if (!Input_Context
1562 || !focus 1516 || !focus
1563 || !(input_style & XIMPreeditArea) 1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1518 || !IMisRunning ())
1565 return; 1519 return;
1566 1520
1521 if (input_style & XIMPreeditPosition)
1522 {
1523 im_set_size (preedit_rect);
1524 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1525
1526 XSetICValues (Input_Context,
1527 XNPreeditAttributes, preedit_attr, NULL);
1528 }
1529 else
1530 {
1567 /* Getting the necessary width of preedit area */ 1531 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1532 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1533 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1534 XFree (status_attr);
1571 1535
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1536 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1537 XFree (needed_rect);
1574 1538
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1539 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1540 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1541
1578 XSetICValues (Input_Context, 1542 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1543 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1544 XNStatusAttributes, status_attr,
1545 NULL);
1581 1546
1547 XFree (status_attr);
1548 }
1549
1582 XFree (preedit_attr); 1550 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1551}
1585#endif /* USE_XIM */ 1552#endif /* USE_XIM */
1553
1554void
1555rxvt_term::get_window_origin (int &x, int &y)
1556{
1557 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560}
1561
1562Pixmap
1563rxvt_term::get_pixmap_property (int prop_id)
1564{
1565 if (prop_id > 0 && prop_id < NUM_XA)
1566 if (xa[prop_id])
1567 {
1568 int aformat;
1569 unsigned long nitems, bytes_after;
1570 Atom atype;
1571 unsigned char *prop = NULL;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP)
1576 return *(Pixmap *)prop;
1577 }
1578
1579 return None;
1580}
1581
1582#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592
1593void
1594rxvt_term::update_background ()
1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1599 bgPixmap.invalidate ();
1600
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1602
1603 if (to_wait <= 0.)
1604 bgPixmap.render ();
1605 else
1606 update_background_ev.start (to_wait);
1607}
1608
1609void
1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{
1612 make_current ();
1613
1614 update_background_ev.stop ();
1615 bgPixmap.render ();
1616 refresh_check ();
1617}
1618
1619#endif /* HAVE_BG_PIXMAP */
1586 1620
1587/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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