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.200 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
214 pty_ev.stop ();
203 delete pty; pty = 0; 215 delete pty; pty = 0;
204} 216}
205 217
206rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
207{ 219{
… …
216#endif 228#endif
217 delete fontset[0]; 229 delete fontset[0];
218 230
219 if (display) 231 if (display)
220 { 232 {
221 dDisp;
222
223 selection_clear (); 233 selection_clear ();
224 234
225#ifdef USE_XIM 235#ifdef USE_XIM
226 im_destroy (); 236 im_destroy ();
227#endif 237#endif
228#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 241#endif
232#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 244#endif
235#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 256#endif
247#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 261#endif
252 if (gc) XFreeGC (disp, gc); 262 if (gc) XFreeGC (dpy, gc);
253 263
254 delete drawable; 264 delete drawable;
255 // destroy all windows 265 // destroy all windows
256 if (parent[0]) 266 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
258 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display 269 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 273#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 274 pix_colors_unfocused [i].free (this);
264#endif 275#endif
276 }
265 277
278 clear ();
279 }
280
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */
266 displays.put (display); 285 displays.put (display);
267 286
268 scr_release (); 287 scr_release ();
269 288
270 /* clear all resources */ 289 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 290 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 291 free (allocated [i]);
273 292
274 free (selection.text); 293 free (selection.text);
275 // TODO: manage env vars in child only(!) 294 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 295 free (env_display);
278 free (env_term); 296 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 297 free (locale);
281 free (v_buffer); 298 free (v_buffer);
282 free (incr_buf); 299 free (incr_buf);
283 300
284 delete envv; 301 delete envv;
285 delete argv; 302 delete argv;
286 303
287#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
288 delete keyboard; 305 delete keyboard;
289#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
290} 310}
291 311
292// child has exited, usually destroys 312// child has exited, usually destroys
293void 313void
294rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
295{ 315{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 317
298 cmd_pid = 0; 318 cmd_pid = 0;
299 319
300 if (!OPTION (Opt_hold)) 320 if (!option (Opt_hold))
301 destroy (); 321 destroy ();
302} 322}
303 323
304void 324void
305rxvt_term::destroy () 325rxvt_term::destroy ()
306{ 326{
307 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
308 return; 328 return;
309 329
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 331
312#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
319 im_ev.stop (display); 339 im_ev.stop (display);
320#endif 340#endif
321#if HAVE_SCROLLBARS 341#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 342 scrollbar_ev.stop (display);
323#endif 343#endif
324#if TRANSPARENT 344#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 345 rootwin_ev.stop (display);
326#endif 346#endif
327 incr_ev.stop (); 347 incr_ev.stop ();
328 termwin_ev.stop (display); 348 termwin_ev.stop (display);
329 vt_ev.stop (display); 349 vt_ev.stop (display);
330 } 350 }
331 351
332 check_ev.stop (); 352 flush_ev.stop ();
333 pty_ev.stop (); 353 pty_ev.stop ();
334#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
336#endif 356#endif
337#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
345#endif 365#endif
346#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
347 pointer_ev.stop (); 367 pointer_ev.stop ();
348#endif 368#endif
349 369
350 destroy_ev.start (0); 370 destroy_ev.start ();
351} 371}
352 372
353void 373void
354rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 375{
356 make_current (); 376 make_current ();
357 377
358 delete this; 378 delete this;
359} 379}
… …
370{ 390{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 391 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 392 (*t)->emergency_cleanup ();
373} 393}
374 394
375#if ENABLE_FRILLS 395#if !ENABLE_MINIMAL
376static void 396static void
377print_x_error (Display *dpy, XErrorEvent *event) 397print_x_error (Display *dpy, XErrorEvent *event)
378{ 398{
379 char buffer[BUFSIZ]; 399 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 400 char mesg[BUFSIZ];
… …
413 else 433 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 435 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 437 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 439 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 441}
422#endif 442#endif
423 443
… …
428 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
429 else 449 else
430 { 450 {
431 // GET_R is most likely not the terminal which caused the error, 451 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 452 // so just output the error and continue
433#if ENABLE_FRILLS 453#if ENABLE_MINIMAL
454 old_xerror_handler (display, event);
455#else
434 print_x_error (display, event); 456 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 457#endif
438 } 458 }
439 459
440 return 0; 460 return 0;
441} 461}
… …
448 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
450} 470}
451 471
452/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
453bool 473void
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{ 475{
456 this->envv = envv; 476 this->envv = envv;
457 477
458 SET_R (this); 478 SET_R (this);
459 set_locale (""); 479 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
461 481
462 if (!init_vars ()) 482 init_vars ();
463 return false;
464 483
465 init_secondary (); 484 init_secondary ();
466 485
467 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
468 487
469#ifdef KEYSYM_RESOURCE 488#ifdef KEYSYM_RESOURCE
470 keyboard->register_done (); 489 keyboard->register_done ();
471#endif 490#endif
472 491
473#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 493 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 494 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 495#endif
477 496
478 pty = ptytty::create (); 497 pty = ptytty::create ();
479 498
480 create_windows (argc, argv); 499 create_windows (argc, argv);
481 500
482 dDisp;
483
484 init_xlocale (); 501 init_xlocale ();
485 502
486 scr_reset (); // initialize screen 503 scr_reset (); // initialize screen
487 504
488#if 0 505#if 0
489 XSynchronize (disp, True); 506 XSynchronize (dpy, True);
490#endif 507#endif
491 508
492#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 510 if (option (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
495#endif 512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516 bgPixmap.invalidate ();
517
496#ifdef TRANSPARENT 518#ifdef ENABLE_TRANSPARENCY
497 if (OPTION (Opt_transparent)) 519 if (option (Opt_transparent))
498 { 520 {
521 bgPixmap.set_transparent ();
522
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
499 XSelectInput (disp, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
502 } 536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap])
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != 0)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
503#endif 562#endif
504 563
505 set_colorfgbg (); 564 set_colorfgbg ();
506 565
507 init_command (cmd_argv); 566 init_command (cmd_argv);
508 567
509 free (cmd_argv); 568 free (cmd_argv);
510 569
511 if (pty->pty >= 0) 570 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
513
514 check_ev.start ();
515 572
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
518 XMapWindow (disp, vt); 585 XMapWindow (dpy, vt);
519 XMapWindow (disp, parent[0]); 586 XMapWindow (dpy, parent[0]);
520 587
521 return true; 588 refresh_check ();
522} 589}
523 590
524static struct sig_handlers 591static struct sig_handlers
525{ 592{
526 sig_watcher sw_term, sw_int; 593 ev::sig sw_term, sw_int;
527 594
528 /* 595 /*
529 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
530 */ 597 */
531 void 598 void sig_term (ev::sig &w, int revents);
532 sig_term (sig_watcher &w) 599
600 sig_handlers ()
533 { 601 {
534 rxvt_emergency_cleanup (); 602 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
535 signal (w.signum, SIG_DFL);
536 kill (getpid (), w.signum);
537 }
538
539 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term),
541 sw_int (this, &sig_handlers::sig_term) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
542 {
543 } 604 }
544} sig_handlers; 605} sig_handlers;
545 606
607void
608sig_handlers::sig_term (ev::sig &w, int revents)
609{
610 rxvt_emergency_cleanup ();
611 w.stop ();
612 kill (getpid (), w.signum);
613}
614
546char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
547 616
548void 617void
549rxvt_init () 618rxvt_init ()
550{ 619{
551 ptytty::init (); 620 ptytty::init ();
621
622 if (!ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
552 624
553 rxvt_environ = environ; 625 rxvt_environ = environ;
554 626
555 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
557 629
558 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
559 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev_unref ();
560 632
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
563 635
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
566 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
567 639
568 XrmInitialize (); 640 XrmInitialize ();
569} 641}
570 642
571/* ------------------------------------------------------------------------- *
572 * MEMORY ALLOCATION WRAPPERS *
573 * ------------------------------------------------------------------------- */
574void *
575rxvt_malloc (size_t size)
576{
577 void *p = malloc (size);
578
579 if (!p)
580 rxvt_fatal ("memory allocation failure. aborting.\n");
581
582 return p;
583}
584
585void *
586rxvt_calloc (size_t number, size_t size)
587{
588 void *p = calloc (number, size);
589
590 if (!p)
591 rxvt_fatal ("memory allocation failure. aborting.\n");
592
593 return p;
594}
595
596void *
597rxvt_realloc (void *ptr, size_t size)
598{
599 void *p = realloc (ptr, size);
600
601 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n");
603
604 return p;
605}
606
607/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
608/* 644/*
609 * window size/position calculcations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
610 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
611 */ 647 */
612void 648void
613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
614{ 650{
615 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 652 int x, y, sb_w, flags;
617 unsigned int w, h; 653 unsigned int w, h;
618 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
619 dDisp;
620 655
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 658 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 659
… …
686 721
687 if (scrollBar.state) 722 if (scrollBar.state)
688 { 723 {
689 sb_w = scrollbar_TotalWidth (); 724 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 725 szHint.base_width += sb_w;
726
691 if (!OPTION (Opt_scrollBar_right)) 727 if (!option (Opt_scrollBar_right))
692 window_vt_x += sb_w; 728 window_vt_x += sb_w;
693 } 729 }
694 730
695 szHint.width_inc = fwidth; 731 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 734 szHint.min_height = szHint.base_height + szHint.height_inc;
699 735
700 if (newwidth && newwidth - szHint.base_width < max_width) 736 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 737 {
702 szHint.width = newwidth; 738 szHint.width = newwidth;
… …
717 { 753 {
718 min_it (height, max_height); 754 min_it (height, max_height);
719 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
720 } 756 }
721 757
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 758 if (scrollBar.state && option (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
724 760
725 if (recalc_x) 761 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763
727 if (recalc_y) 764 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 766
730 ncol = width / fwidth; 767 ncol = width / fwidth;
731 nrow = height / fheight; 768 nrow = height / fheight;
732} 769}
733 770
… …
749 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
750 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
752 789
753#if 0 790#if 0
754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
755 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
756 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
757#endif 794#endif
758} 795}
759 796
… …
788 delete fontset[0]; 825 delete fontset[0];
789 fontset[0] = fs; 826 fontset[0] = fs;
790 827
791 prop = (*fs)[1]->properties (); 828 prop = (*fs)[1]->properties ();
792 prop.height += lineSpace; 829 prop.height += lineSpace;
830
793 fs->set_prop (prop); 831 fs->set_prop (prop, false);
794 832
795 fwidth = prop.width; 833 fwidth = prop.width;
796 fheight = prop.height; 834 fheight = prop.height;
797 fbase = prop.ascent; 835 fbase = prop.ascent;
798 836
… …
807 { 845 {
808 fontset[style] = fs = new rxvt_fontset (this); 846 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 847 rxvt_fontprop prop2 = prop;
810 848
811 if (res) 849 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 850 {
851 fs->populate (res);
852 fs->set_prop (prop2, false);
853 }
813 else 854 else
814 { 855 {
815 res = fontset[0]->fontdesc; 856 fs->populate (fontset[0]->fontdesc);
816 857
817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 858 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 859 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
860
861 fs->set_prop (prop2, true);
819 } 862 }
820 863
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 864 }
824#else 865#else
825 fontset[style] = fontset[0]; 866 fontset[style] = fontset[0];
826#endif 867#endif
827 } 868 }
… …
829 if (parent[0]) 870 if (parent[0])
830 { 871 {
831 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
832 scr_remap_chars (); 873 scr_remap_chars ();
833 scr_touch (true); 874 scr_touch (true);
834 } 875 }
835 876
836 return true; 877 return true;
837} 878}
838 879
880void
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 882{
841 XChangeProperty (display->display, parent[0], 883 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 886}
845 887
888void
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 889rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 890{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 891 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 892 char *s = rxvt_wcstoutf8 (ws);
850 893
851 XChangeProperty (display->display, parent[0], 894 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 895 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 896 (const unsigned char *)s, strlen (s));
854 897
855 free (s); 898 free (s);
856 free (ws); 899 free (ws);
… …
875#if ENABLE_EWMH 918#if ENABLE_EWMH
876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
877#endif 920#endif
878} 921}
879 922
923void
924rxvt_term::set_window_color (int idx, const char *color)
925{
880#ifdef XTERM_COLOR_CHANGE 926#ifdef XTERM_COLOR_CHANGE
881void
882rxvt_term::set_window_color (int idx, const char *color)
883{
884 rxvt_color xcol; 927 rxvt_color xcol;
885 int i; 928 int i;
886 929
887 if (color == NULL || *color == '\0') 930 if (color == NULL || *color == '\0')
888 return; 931 return;
889 932
933 color = strdup (color);
934 allocated.push_back ((void *)color);
935 rs[Rs_color + idx] = color;
936
890 /* handle color aliases */ 937 /* handle color aliases */
891 if (isdigit (*color)) 938 if (isdigit (*color))
892 { 939 {
893 i = atoi (color); 940 i = atoi (color);
894 941
895 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
943 {
896 { /* bright colors */ 944 /* bright colors */
897 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
899 SET_PIXCOLOR (idx);
900 goto done; 946 goto done;
901 } 947 }
902 948
903 if (i >= 0 && i <= 7) 949 if (i >= 0 && i <= 7)
950 {
904 { /* normal colors */ 951 /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 953 goto done;
908 } 954 }
909 } 955 }
910 956
911 if (!rXParseAllocColor (&xcol, color)) 957 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 958
916 /* 959 /*
917 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
919 */ 962 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 963
932 pix_colors_focused[idx] = xcol; 964 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 965
935 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */
937done: 966done:
938
939#if OFF_FOCUS_FADING
940 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
942#endif
943
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 967 /*TODO: handle Color_BD, scrollbar background, etc. */
945 968
969 update_fade_color (idx);
946 recolour_cursor (); 970 recolour_cursor ();
947 scr_recolour (); 971 scr_recolour ();
972#endif /* XTERM_COLOR_CHANGE */
948} 973}
949
950#else
951# define set_window_color (idx,color) ((void)0)
952#endif /* XTERM_COLOR_CHANGE */
953 974
954void 975void
955rxvt_term::recolour_cursor () 976rxvt_term::recolour_cursor ()
956{ 977{
957 XColor xcol[2]; 978 XColor fg, bg;
958 979
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 980 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 981 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 982 : pix_colors_focused[Color_fg]).get (fg);
983
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 984 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 985 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 986 : pix_colors_focused[Color_bg]).get (bg);
965 987
966 XQueryColors (display->display, display->cmap, xcol, 2); 988 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 989}
969 990
970/*----------------------------------------------------------------------*/ 991/*----------------------------------------------------------------------*/
971/* 992/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 993 * find if fg/bg matches any of the normal (low-intensity) colors
973 */ 994 */
974void 995void
975rxvt_term::set_colorfgbg () 996rxvt_term::set_colorfgbg ()
976{ 997{
977 unsigned int i; 998 unsigned int i;
978 const char *xpmb = "\0"; 999 const char *xpmb = "";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1000 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 1001
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 1002 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 1003 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 1004 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 1005 if (pix_colors[Color_fg] == pix_colors[i])
986 { 1006 {
… …
990 1010
991 for (i = Color_Black; i <= Color_White; i++) 1011 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 1012 if (pix_colors[Color_bg] == pix_colors[i])
993 { 1013 {
994 sprintf (bstr, "%d", (i - Color_Black)); 1014 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 1015#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 1016 xpmb = "default;";
997#endif 1017#endif
998 break; 1018 break;
999 } 1019 }
1000 1020
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1021 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 1022}
1003 1023
1004/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
1005 1025
1006int 1026bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1027rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 1028{
1009 if (!screen_in_out->set (display, colour)) 1029 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 1030 return true;
1031
1032 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1033 return false;
1034}
1035
1036void
1037rxvt_term::alias_color (int dst, int src)
1038{
1039 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 1040}
1017 1041
1018/* -------------------------------------------------------------------- * 1042/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 1043 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 1044 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1046rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 1047{
1024 int fix_screen; 1048 int fix_screen;
1025 int old_width = szHint.width; 1049 int old_width = szHint.width;
1026 int old_height = szHint.height; 1050 int old_height = szHint.height;
1027 dDisp;
1028 1051
1029 window_calc (newwidth, newheight); 1052 window_calc (newwidth, newheight);
1053
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1055 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 1056
1032 if (!ignoreparent) 1057 if (!ignoreparent)
1033 { 1058 {
1034#ifdef SMART_RESIZE 1059#ifdef SMART_RESIZE
1035 /* 1060 /*
… …
1039 int x, y, x1, y1; 1064 int x, y, x1, y1;
1040 int dx, dy; 1065 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1067 Window unused_cr;
1043 1068
1044 XTranslateCoordinates (disp, parent[0], display->root, 1069 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1070 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1071 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1073 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 1074 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 1075 * our position for handles and decorations. Counter it
1051 */ 1076 */
… …
1053 { 1078 {
1054 x -= x1; 1079 x -= x1;
1055 y -= y1; 1080 y -= y1;
1056 } 1081 }
1057 1082
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1083 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1084 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1085 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1086 dy = old_height - szHint.height;
1062 1087
1063 /* Check position of the center of the window */ 1088 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1089 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1093 if (y < y1) /* top half */
1069 dy = 0; 1094 dy = 0;
1070 else if (y == y1) /* exact center */ 1095 else if (y == y1) /* exact center */
1071 dy /= 2; 1096 dy /= 2;
1072 1097
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1098 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1099 szHint.width, szHint.height);
1075#else 1100#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 1102#endif
1078 } 1103 }
1079 1104
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1106
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1107 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1108 {
1084 if (scrollBar.state) 1109 if (scrollBar.state)
1085 { 1110 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1111 XMoveResizeWindow (dpy, scrollBar.win,
1087 window_sb_x, 0, 1112 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1113 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1114 resize_scrollbar ();
1090 } 1115 }
1091 1116
1092 XMoveResizeWindow (disp, vt, 1117 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1118 window_vt_x, window_vt_y,
1094 width, height); 1119 width, height);
1095 1120
1121#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ())
1123 update_background ();
1124#endif
1125
1096 scr_clear (); 1126 scr_clear ();
1097#ifdef XPM_BACKGROUND
1098 resize_pixmap ();
1099#endif
1100 } 1127 }
1101 1128
1102 if (fix_screen || old_height == 0) 1129 if (fix_screen || old_height == 0)
1103 scr_reset (); 1130 scr_reset ();
1104 1131
1105#ifdef XPM_BACKGROUND 1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1106 if (pixmap) 1133 //scr_touch (false);
1134
1135#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137// if (bgPixmap.pixmap)
1107 scr_touch (false); 1138// scr_touch (false);
1108#endif 1139#endif
1109 1140
1110#ifdef USE_XIM 1141#ifdef USE_XIM
1111 IMSetStatusPosition (); 1142 IMSetPosition ();
1112#endif 1143#endif
1113} 1144}
1114 1145
1115/* 1146/*
1116 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121{ 1152{
1122 XWindowAttributes wattr; 1153 XWindowAttributes wattr;
1123 1154
1124 if (newwidth == 0 || newheight == 0) 1155 if (newwidth == 0 || newheight == 0)
1125 { 1156 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1157 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1158
1128 if (newwidth == 0) 1159 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1161 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1176#ifdef USE_XIM
1146 1177
1147void 1178void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1180{
1150 fg = pix_colors[Color_fg]; 1181 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1182 bg = pix_colors [Color_bg];
1152} 1183}
1153 1184
1154void 1185void
1155rxvt_term::im_set_size (XRectangle &size) 1186rxvt_term::im_set_size (XRectangle &size)
1156{ 1187{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1225
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1227 *p = '\0';
1197 1228
1198 atom = XInternAtom (display->display, server, False); 1229 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1230 win = XGetSelectionOwner (dpy, atom);
1200 1231
1201 if (win != None) 1232 if (win != None)
1202 return True; 1233 return True;
1203 } 1234 }
1204 1235
… …
1211 XPoint nspot; 1242 XPoint nspot;
1212 XVaNestedList preedit_attr; 1243 XVaNestedList preedit_attr;
1213 1244
1214 if (!Input_Context 1245 if (!Input_Context
1215 || !focus 1246 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1247 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1248 return;
1218 1249
1219 im_set_position (nspot); 1250 im_set_position (nspot);
1220 1251
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1252 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1283 if (term->rs[Rs_imLocale]) 1314 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale); 1315 SET_LOCALE (term->locale);
1285 } 1316 }
1286 else 1317 else
1287 str = (void *)text->string.wide_char; 1318 str = (void *)text->string.wide_char;
1288 1319
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret, 1321 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first, 1322 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length, 1323 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1324 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1300 DT_INT, call_data->chg_first, 1331 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length, 1332 DT_INT, call_data->chg_length,
1302 DT_END)); 1333 DT_END));
1303} 1334}
1304 1335
1336#if 0
1305static void 1337static void
1306xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) 1338xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1307{ 1339{
1308 ((rxvt_term *)client_data)->make_current (); 1340 ((rxvt_term *)client_data)->make_current ();
1309 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, 1341 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1310 DT_INT, call_data->position, 1342 DT_INT, call_data->position,
1311 DT_INT, call_data->direction, 1343 DT_INT, call_data->direction,
1312 DT_INT, call_data->style, 1344 DT_INT, call_data->style,
1313 DT_END)); 1345 DT_END));
1314} 1346}
1347#endif
1315 1348
1316#endif 1349#endif
1317 1350
1318/* 1351/*
1319 * Try to open a XIM with the current modifiers, then see if we can 1352 * Try to open a XIM with the current modifiers, then see if we can
… …
1426 "*", 1459 "*",
1427 fheight, 1460 fheight,
1428 fheight + 1, fheight - 1, 1461 fheight + 1, fheight - 1,
1429 fheight - 2, fheight + 2); 1462 fheight - 2, fheight + 2);
1430 1463
1431 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1464 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1432 &missing_charset_list, &missing_charset_count, &def_string); 1465 &missing_charset_list, &missing_charset_count, &def_string);
1433 1466
1434 if (missing_charset_list) 1467 if (missing_charset_list)
1435 XFreeStringList (missing_charset_list); 1468 XFreeStringList (missing_charset_list);
1436 1469
… …
1477 XNBackground, bg, 1510 XNBackground, bg,
1478 XNArea, &status_rect, 1511 XNArea, &status_rect,
1479 XNFontSet, fs, 1512 XNFontSet, fs,
1480 NULL); 1513 NULL);
1481 } 1514 }
1515#if ENABLE_XIM_ONTHESPOT
1482 else if (input_style & XIMPreeditCallbacks) 1516 else if (input_style & XIMPreeditCallbacks)
1483 { 1517 {
1518 im_set_position (spot);
1519
1484 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1520 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1485 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1521 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1486 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1523# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1524 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1525# endif
1488 1526
1489 preedit_attr = XVaCreateNestedList (0, 1527 preedit_attr = XVaCreateNestedList (0,
1528 XNSpotLocation, &spot,
1490 XNPreeditStartCallback, &xcb[0], 1529 XNPreeditStartCallback, &xcb[0],
1491 XNPreeditDoneCallback , &xcb[1], 1530 XNPreeditDoneCallback , &xcb[1],
1492 XNPreeditDrawCallback , &xcb[2], 1531 XNPreeditDrawCallback , &xcb[2],
1532# if 0
1493 XNPreeditCaretCallback, &xcb[3], 1533 XNPreeditCaretCallback, &xcb[3],
1534# endif
1494 NULL); 1535 NULL);
1495 } 1536 }
1537#endif
1496 1538
1497 Input_Context = XCreateIC (xim, 1539 Input_Context = XCreateIC (xim,
1498 XNInputStyle, input_style, 1540 XNInputStyle, input_style,
1499 XNClientWindow, vt, 1541 XNClientWindow, vt,
1500 XNFocusWindow, parent[0], 1542 XNFocusWindow, parent[0],
… …
1502 preedit_attr, 1544 preedit_attr,
1503 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1504 status_attr, NULL); 1546 status_attr, NULL);
1505 1547
1506 if (preedit_attr) XFree (preedit_attr); 1548 if (preedit_attr) XFree (preedit_attr);
1507 if (status_attr) XFree (status_attr); 1549 if (status_attr) XFree (status_attr);
1508 if (fs) XFreeFontSet (display->display, fs); 1550 if (fs) XFreeFontSet (dpy, fs);
1509 1551
1510 if (Input_Context == NULL) 1552 if (Input_Context == NULL)
1511 { 1553 {
1512 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1554 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1513 im_destroy (); 1555 im_destroy ();
… …
1518 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1519 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1520 vt_select_input (); 1562 vt_select_input ();
1521#endif 1563#endif
1522 1564
1523 if (input_style & XIMPreeditArea)
1524 IMSetStatusPosition (); 1565 IMSetPosition ();
1525 1566
1526 return true; 1567 return true;
1527} 1568}
1528 1569
1529void 1570void
… …
1587 SET_LOCALE (locale); 1628 SET_LOCALE (locale);
1588#endif 1629#endif
1589} 1630}
1590 1631
1591void 1632void
1592rxvt_term::IMSetStatusPosition () 1633rxvt_term::IMSetPosition ()
1593{ 1634{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1635 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1636 XVaNestedList preedit_attr, status_attr;
1596 1637
1597 if (!Input_Context 1638 if (!Input_Context
1598 || !focus 1639 || !focus
1599 || !(input_style & XIMPreeditArea) 1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1641 || !IMisRunning ())
1601 return; 1642 return;
1602 1643
1644 if (input_style & XIMPreeditPosition)
1645 {
1646 im_set_size (preedit_rect);
1647 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1648
1649 XSetICValues (Input_Context,
1650 XNPreeditAttributes, preedit_attr, NULL);
1651 }
1652 else
1653 {
1603 /* Getting the necessary width of preedit area */ 1654 /* Getting the necessary width of preedit area */
1604 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1655 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1605 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1656 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1606 XFree (status_attr); 1657 XFree (status_attr);
1607 1658
1608 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1659 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1609 XFree (needed_rect); 1660 XFree (needed_rect);
1610 1661
1611 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1662 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1612 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1663 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1613 1664
1614 XSetICValues (Input_Context, 1665 XSetICValues (Input_Context,
1615 XNPreeditAttributes, preedit_attr, 1666 XNPreeditAttributes, preedit_attr,
1616 XNStatusAttributes, status_attr, NULL); 1667 XNStatusAttributes, status_attr,
1668 NULL);
1617 1669
1670 XFree (status_attr);
1671 }
1672
1618 XFree (preedit_attr); 1673 XFree (preedit_attr);
1619 XFree (status_attr);
1620} 1674}
1621#endif /* USE_XIM */ 1675#endif /* USE_XIM */
1676
1677void
1678rxvt_term::get_window_origin (int &x, int &y)
1679{
1680 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683}
1684
1685Pixmap
1686rxvt_term::get_pixmap_property (int prop_id)
1687{
1688 if (prop_id > 0 && prop_id < NUM_XA)
1689 if (xa[prop_id])
1690 {
1691 int aformat;
1692 unsigned long nitems, bytes_after;
1693 Atom atype;
1694 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP)
1699 return *(Pixmap *)prop;
1700 }
1701
1702 return None;
1703}
1704
1705#ifdef HAVE_BG_PIXMAP
1706# if TRACE_PIXMAPS
1707# undef update_background
1708void
1709rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715
1716void
1717rxvt_term::update_background ()
1718{
1719 if (update_background_ev.is_active ())
1720 return;
1721
1722 bgPixmap.invalidate ();
1723
1724 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1725
1726 if (to_wait <= 0.)
1727 bgPixmap.render ();
1728 else
1729 update_background_ev.start (to_wait);
1730}
1731
1732void
1733rxvt_term::update_background_cb (ev::timer &w, int revents)
1734{
1735 make_current ();
1736
1737 update_background_ev.stop ();
1738 bgPixmap.render ();
1739 refresh_check ();
1740}
1741
1742#endif /* HAVE_BG_PIXMAP */
1622 1743
1623/*----------------------- end-of-file (C source) -----------------------*/ 1744/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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