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.347 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs.
Revision 1.393 by root, Sat Dec 13 09:50:43 2014 UTC

… …
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-2010 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif 229#endif
233#ifdef HAVE_AFTERIMAGE 230
234 if (asv) 231#if HAVE_IMG
235 destroy_asvisual (asv, 0); 232 delete bg_img;
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 233#endif
239 234
240 if (display) 235 if (display)
241 { 236 {
242 selection_clear (); 237 selection_clear ();
243 selection_clear (true); 238 selection_clear (true);
244 239
245#ifdef USE_XIM 240#if USE_XIM
246 im_destroy (); 241 im_destroy ();
247#endif 242#endif
248 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
249 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
250 247
251 delete drawable; 248 delete drawable;
249
252 // destroy all windows 250 // destroy all windows
253 if (parent[0]) 251 if (parent)
254 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
255 253
256 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
258 { 256 {
259 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 273 free (allocated [i]);
276 274
277 free (selection.text); 275 free (selection.text);
278 free (selection.clip_text); 276 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 277 free (locale);
283 free (v_buffer); 278 free (v_buffer);
284 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
285 286
286 delete envv; 287 delete envv;
287 delete argv; 288 delete argv;
288 289
289#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
290 delete keyboard; 291 delete keyboard;
291#endif 292#endif
292#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
294#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
295} 298}
296 299
297// child has exited, usually destroys 300// child has exited, usually destroys
298void 301void
299rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
322 { 325 {
323#if USE_XIM 326#if USE_XIM
324 im_ev.stop (display); 327 im_ev.stop (display);
325#endif 328#endif
326 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 330#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
329#endif 332#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 333 termwin_ev.stop (display);
332 vt_ev.stop (display); 334 vt_ev.stop (display);
333 } 335 }
334 336
335 flush_ev.stop (); 337 flush_ev.stop ();
… …
360 362
361 delete this; 363 delete this;
362} 364}
363 365
364void 366void
365rxvt_term::set_option (uint8_t opt, bool set) 367rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 368{
367 if (!opt) 369 if (!opt)
368 return; 370 return;
369 371
370 uint8_t mask = 1 << (opt & 7); 372 uint8_t mask = 1 << (opt & 7);
… …
374} 376}
375 377
376/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
377/* 379/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 381 */
381static XErrorHandler old_xerror_handler; 382static XErrorHandler old_xerror_handler;
382 383
383static void 384static void
384rxvt_emergency_cleanup () 385rxvt_emergency_cleanup ()
… …
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
388} 389}
389 390
390#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
391static void 392static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
393{ 394{
394 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
396 char number[32]; 397 char number[32];
397 const char mtype[] = "XlibMessage"; 398
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 399 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
400
401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
403
404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
407
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 409 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410
411 if (event->request_code >= 128)
412 {
413#if 0
414 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
415 int nexts;
416 char **exts = XListExtensions (dpy, &nexts);
417
418 while (nexts)
419 {
420 char *extname = exts [nexts - 1];
421 int major, first_event, first_error;
422
423 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
424 {
425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
426 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
427
428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
430 rxvt_warn ("+ (which is %s)\n", buffer);
431
432 break;
433 }
434
435 printf ("nextss %d %s\n", nexts, extname);//D
436 --nexts;
437 ++exts;
438 }
439#else
440 int nexts = 0;
441 char **exts = 0;
442#endif
443
444 if (!nexts)
445 {
446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
447
448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
449 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
450
451#if 0
452 sprintf (number, "RENDER.%d", event->minor_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455#endif
456 }
457
458 XFreeExtensionList (exts);
459 }
460 else
461 {
404 sprintf(number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 464 rxvt_warn ("+ (which is %s)\n", buffer);
407 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 465 }
466
412 if ((event->error_code == BadWindow) || 467 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 468 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 469 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 470 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 471 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 472 || event->error_code == BadColor
418 (event->error_code == BadGC) || 473 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 474 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 475 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 476 || event->error_code == BadAtom)
477 {
422 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 else 482 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 484
439int 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
486 }
487}
488#endif
489
490int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 492{
442 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
444 else 495 else
445 { 496 {
446 // GET_R is most likely not the terminal which caused the error, 497 // GET_R is most likely not the terminal which caused the error,
447 // so just output the error and continue 498 // so just output the error and continue
… …
453 } 504 }
454 505
455 return 0; 506 return 0;
456} 507}
457 508
458int 509int ecb_cold
459rxvt_xioerror_handler (Display *display) 510rxvt_xioerror_handler (Display *display)
460{ 511{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 512 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display)); 513 DisplayString (display));
463 rxvt_emergency_cleanup (); 514 rxvt_emergency_cleanup ();
… …
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 634 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 635 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 636 XSetIOErrorHandler (rxvt_xioerror_handler);
586 637
587 XrmInitialize (); 638 XrmInitialize ();
639
640#if HAVE_PIXBUF
641 g_type_init ();
642#endif
588} 643}
589 644
590/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
591/* 646/*
592 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
713 if (recalc_y) 768 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 769 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 770
716 ncol = width / fwidth; 771 ncol = width / fwidth;
717 nrow = height / fheight; 772 nrow = height / fheight;
773
774 // When the size of the vt window is not a multiple of the cell
775 // size, i.e., when the wm does not honour our size hints, there are
776 // extra areas not covered by the terminal screen. Such gaps, when a
777 // bg pixmap is set, would have to be cleared manually to properly
778 // refresh the background. We take the simpler route and shrink the
779 // vt window so as to avoid creating gaps.
780 vt_width = ncol * fwidth;
781 vt_height = nrow * fheight;
718} 782}
719 783
720/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
721/* 785/*
722 * Tell the teletype handler what size the window is. 786 * Tell the teletype handler what size the window is.
… …
730 794
731 struct winsize ws; 795 struct winsize ws;
732 796
733 ws.ws_col = ncol; 797 ws.ws_col = ncol;
734 ws.ws_row = nrow; 798 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 799 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 800 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 801 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 802
739#if 0 803#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 804 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 805 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 806 kill (-cmd_pid, SIGWINCH);
743#endif 807#endif
744} 808}
745 809
746/*----------------------------------------------------------------------*/ 810/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 811/* load and set the various fonts */
748 *
749 * init = 1 - initialize
750 *
751 * fontname == FONT_UP - switch to bigger font
752 * fontname == FONT_DN - switch to smaller font
753 */
754bool 812bool
755rxvt_term::set_fonts () 813rxvt_term::set_fonts ()
756{ 814{
757 rxvt_fontset *fs = new rxvt_fontset (this); 815 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 816 rxvt_fontprop prop;
… …
773 831
774 delete fontset[0]; 832 delete fontset[0];
775 fontset[0] = fs; 833 fontset[0] = fs;
776 834
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace; 836 prop.width = max (prop.width + letterSpace, 1);
779 prop.width += letterSpace;
780 837
781 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
782 839
783 fwidth = prop.width; 840 fwidth = prop.width;
784 fheight = prop.height; 841 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 842 fbase = prop.ascent;
786 843
787 for (int style = 1; style < 4; style++) 844 for (int style = 1; style < 4; style++)
788 { 845 {
789#if ENABLE_STYLES 846#if ENABLE_STYLES
… …
815#else 872#else
816 fontset[style] = fontset[0]; 873 fontset[style] = fontset[0];
817#endif 874#endif
818 } 875 }
819 876
820 if (parent[0]) 877 if (parent)
821 { 878 {
822 resize_all_windows (0, 0, 0); 879 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 880 scr_remap_chars ();
824 scr_touch (true); 881 scr_touch (true);
825 } 882 }
… …
828} 885}
829 886
830void 887void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 888rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 889{
833 XChangeProperty (dpy, parent[0], 890 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 891 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 892 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 893}
837 894
838void 895void
… …
840{ 897{
841 XTextProperty ct; 898 XTextProperty ct;
842 899
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 900 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 901 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 902 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 903 XFree (ct.value);
847 } 904 }
848} 905}
849 906
850void 907void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 908rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 909{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 910 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 911 char *s = rxvt_wcstoutf8 (ws);
855 912
856 XChangeProperty (dpy, parent[0], 913 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 914 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 915 (const unsigned char *)s, strlen (s));
859 916
860 free (s); 917 free (s);
861 free (ws); 918 free (ws);
… …
951 1008
952/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
953/* 1010/*
954 * find if fg/bg matches any of the normal (low-intensity) colors 1011 * find if fg/bg matches any of the normal (low-intensity) colors
955 */ 1012 */
956void 1013char *
957rxvt_term::set_colorfgbg () 1014rxvt_term::get_colorfgbg ()
958{ 1015{
959 unsigned int i; 1016 unsigned int i;
960 const char *xpmb = ""; 1017 const char *xpmb = "";
961 char fstr[] = "default"; 1018 char fstr[] = "default";
962 char bstr[] = "default"; 1019 char bstr[] = "default";
1020 char *env_colorfgbg;
963 1021
964 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_fg] == pix_colors[i]) 1023 if (pix_colors[Color_fg] == pix_colors[i])
966 { 1024 {
967 sprintf (fstr, "%d", i - Color_Black); 1025 sprintf (fstr, "%d", i - Color_Black);
… …
970 1028
971 for (i = Color_Black; i <= Color_White; i++) 1029 for (i = Color_Black; i <= Color_White; i++)
972 if (pix_colors[Color_bg] == pix_colors[i]) 1030 if (pix_colors[Color_bg] == pix_colors[i])
973 { 1031 {
974 sprintf (bstr, "%d", i - Color_Black); 1032 sprintf (bstr, "%d", i - Color_Black);
975#ifdef BG_IMAGE_FROM_FILE 1033#if BG_IMAGE_FROM_FILE
976 xpmb = "default;"; 1034 xpmb = "default;";
977#endif 1035#endif
978 break; 1036 break;
979 } 1037 }
980 1038
1039 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
981 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1040 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1041 return env_colorfgbg;
982} 1042}
983 1043
984/*----------------------------------------------------------------------*/ 1044/*----------------------------------------------------------------------*/
985 1045
986bool 1046bool
… …
1015 1075
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1076 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint) 1077 if (set_hint)
1018 { 1078 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1079 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1080 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1081 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1082 }
1023 1083
1024 if (!ignoreparent) 1084 if (!ignoreparent)
1025 { 1085 {
… …
1031 int x, y, x1, y1; 1091 int x, y, x1, y1;
1032 int dx, dy; 1092 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1093 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1094 Window unused_cr;
1035 1095
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1096 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1097 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1098 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1099 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1100 /*
1041 * if display->root isn't the parent window, a WM will probably have offset 1101 * if display->root isn't the parent window, a WM will probably have offset
1042 * our position for handles and decorations. Counter it 1102 * our position for handles and decorations. Counter it
1043 */ 1103 */
… …
1060 if (y < y1) /* top half */ 1120 if (y < y1) /* top half */
1061 dy = 0; 1121 dy = 0;
1062 else if (y == y1) /* exact center */ 1122 else if (y == y1) /* exact center */
1063 dy /= 2; 1123 dy /= 2;
1064 1124
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1125 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1126 szHint.width, szHint.height);
1067#else 1127#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1128 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1129#endif
1070 } 1130 }
1071 1131
1072 if (set_hint) 1132 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1133 XSetWMNormalHints (dpy, parent, &szHint);
1074 1134
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1135 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1136
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1137 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1138 {
1079 if (scrollBar.state) 1139 if (scrollBar.state)
1080 scrollBar.resize (); 1140 scrollBar.resize ();
1081 1141
1082 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1084 width, height); 1144 vt_width, vt_height);
1145
1146 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085 1147
1086#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1149 if (bg_window_size_sensitive ())
1088 update_background (); 1150 update_background ();
1089#endif 1151#endif
1090 } 1152 }
1091 1153
1092 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1093 scr_reset (); 1155 scr_reset ();
1094 1156
1095#ifdef HAVE_BG_PIXMAP
1096// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1097// if (bgPixmap.pixmap)
1098// scr_touch (false);
1099#endif
1100
1101#ifdef USE_XIM 1157#if USE_XIM
1102 IMSetPosition (); 1158 im_set_position ();
1103#endif 1159#endif
1104} 1160}
1105 1161
1106/* 1162/*
1107 * Set the width/height of the vt window in characters. Units are pixels. 1163 * Set the width/height of the vt window in characters. Units are pixels.
… …
1120 newwidth = wattr.width - szHint.base_width; 1176 newwidth = wattr.width - szHint.base_width;
1121 if (newheight == 0) 1177 if (newheight == 0)
1122 newheight = wattr.height - szHint.base_height; 1178 newheight = wattr.height - szHint.base_height;
1123 } 1179 }
1124 1180
1125 if (newwidth != width || newheight != height) 1181 if (newwidth != vt_width || newheight != vt_height)
1126 { 1182 {
1127 newwidth += szHint.base_width; 1183 newwidth += szHint.base_width;
1128 newheight += szHint.base_height; 1184 newheight += szHint.base_height;
1129 resize_all_windows (newwidth, newheight, 0); 1185 resize_all_windows (newwidth, newheight, 0);
1130 } 1186 }
1131} 1187}
1132 1188
1133/* -------------------------------------------------------------------- * 1189/* -------------------------------------------------------------------- *
1134 * - X INPUT METHOD ROUTINES - * 1190 * - X INPUT METHOD ROUTINES - *
1135 * -------------------------------------------------------------------- */ 1191 * -------------------------------------------------------------------- */
1136#ifdef USE_XIM 1192#if USE_XIM
1137 1193
1138void 1194void
1139rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1195rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1140{ 1196{
1141 fg = pix_colors [Color_fg]; 1197 fg = pix_colors [Color_fg];
… …
1168 status_rect.height = fheight; 1224 status_rect.height = fheight;
1169} 1225}
1170 1226
1171/* Checking whether input method is running. */ 1227/* Checking whether input method is running. */
1172bool 1228bool
1173rxvt_term::IMisRunning () 1229rxvt_term::im_is_running ()
1174{ 1230{
1175 Atom atom; 1231 Atom atom;
1176 Window win; 1232 Window win;
1177 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1178 1234
… …
1187 1243
1188 atom = XInternAtom (dpy, server, False); 1244 atom = XInternAtom (dpy, server, False);
1189 win = XGetSelectionOwner (dpy, atom); 1245 win = XGetSelectionOwner (dpy, atom);
1190 1246
1191 if (win != None) 1247 if (win != None)
1192 return True; 1248 return true;
1193 } 1249 }
1194 1250
1195 return False; 1251 return false;
1196} 1252}
1197 1253
1198void 1254void
1199rxvt_term::IMSendSpot () 1255rxvt_term::im_send_spot ()
1200{ 1256{
1201 XPoint nspot; 1257 XPoint nspot;
1202 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1203 1259
1204 if (!Input_Context 1260 if (!Input_Context
… …
1310/* 1366/*
1311 * Try to open a XIM with the current modifiers, then see if we can 1367 * Try to open a XIM with the current modifiers, then see if we can
1312 * open a suitable preedit type 1368 * open a suitable preedit type
1313 */ 1369 */
1314bool 1370bool
1315rxvt_term::IM_get_IC (const char *modifiers) 1371rxvt_term::im_get_ic (const char *modifiers)
1316{ 1372{
1317 int i, j, found; 1373 int i, j, found;
1318 XIM xim; 1374 XIM xim;
1319 XPoint spot; 1375 XPoint spot;
1320 XRectangle rect, status_rect, needed_rect; 1376 XRectangle rect, status_rect, needed_rect;
1321 unsigned long fg, bg; 1377 unsigned long fg, bg;
1322 const char *p; 1378 const char *p;
1323 char **s; 1379 char **s;
1324 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1325#ifdef ENABLE_XIM_ONTHESPOT
1326 XIMCallback xcb[4];
1327#endif
1328 1381
1329 set_environ (envv); 1382 set_environ (env);
1330 1383
1331 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1332 return false; 1385 return false;
1333 1386
1334 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1335 if (input_method == NULL) 1388 if (input_method == NULL)
1336 return false; 1389 return false;
… …
1472 NULL); 1525 NULL);
1473 } 1526 }
1474#if ENABLE_XIM_ONTHESPOT 1527#if ENABLE_XIM_ONTHESPOT
1475 else if (input_style & XIMPreeditCallbacks) 1528 else if (input_style & XIMPreeditCallbacks)
1476 { 1529 {
1530 XIMCallback xcb[4];
1531
1477 im_set_position (spot); 1532 im_set_position (spot);
1478 1533
1479 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1534 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1480 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1535 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1481 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1536 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1496#endif 1551#endif
1497 1552
1498 Input_Context = XCreateIC (xim, 1553 Input_Context = XCreateIC (xim,
1499 XNInputStyle, input_style, 1554 XNInputStyle, input_style,
1500 XNClientWindow, vt, 1555 XNClientWindow, vt,
1501 XNFocusWindow, parent[0], 1556 XNFocusWindow, parent,
1502 preedit_attr ? XNPreeditAttributes : NULL, 1557 preedit_attr ? XNPreeditAttributes : NULL,
1503 preedit_attr, 1558 preedit_attr,
1504 status_attr ? XNStatusAttributes : NULL, 1559 status_attr ? XNStatusAttributes : NULL,
1505 status_attr, NULL); 1560 status_attr, NULL);
1506 1561
… …
1519 // unfortunately, only the focus window is used by XIM, hard to fix 1574 // unfortunately, only the focus window is used by XIM, hard to fix
1520 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1575 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1521 vt_select_input (); 1576 vt_select_input ();
1522#endif 1577#endif
1523 1578
1524 IMSetPosition (); 1579 im_set_position ();
1525 1580
1526 return true; 1581 return true;
1527} 1582}
1528 1583
1529void 1584void
… …
1539 im_destroy (); 1594 im_destroy ();
1540 1595
1541 if (Input_Context) 1596 if (Input_Context)
1542 return; 1597 return;
1543 1598
1544#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1545 if (rs[Rs_imLocale]) 1599 if (rs[Rs_imLocale])
1546 SET_LOCALE (rs[Rs_imLocale]); 1600 SET_LOCALE (rs[Rs_imLocale]);
1547#endif
1548 1601
1549 p = rs[Rs_inputMethod]; 1602 p = rs[Rs_inputMethod];
1550 if (p && *p) 1603 if (p && *p)
1551 { 1604 {
1552 bool found = false; 1605 bool found = false;
… …
1557 { 1610 {
1558 if (*s[i]) 1611 if (*s[i])
1559 { 1612 {
1560 strcpy (buf, "@im="); 1613 strcpy (buf, "@im=");
1561 strncat (buf, s[i], IMBUFSIZ - 5); 1614 strncat (buf, s[i], IMBUFSIZ - 5);
1562 if (IM_get_IC (buf)) 1615 if (im_get_ic (buf))
1563 { 1616 {
1564 found = true; 1617 found = true;
1565 break; 1618 break;
1566 } 1619 }
1567 } 1620 }
… …
1572 if (found) 1625 if (found)
1573 goto done; 1626 goto done;
1574 } 1627 }
1575 1628
1576 /* try with XMODIFIERS env. var. */ 1629 /* try with XMODIFIERS env. var. */
1577 if (IM_get_IC ("")) 1630 if (im_get_ic (""))
1578 goto done; 1631 goto done;
1579 1632
1580 /* try with no modifiers base IF the user didn't specify an IM */ 1633 /* try with no modifiers base IF the user didn't specify an IM */
1581 if (IM_get_IC ("@im=none")) 1634 if (im_get_ic ("@im=none"))
1582 goto done; 1635 goto done;
1583 1636
1584done: 1637done:
1585#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1586 if (rs[Rs_imLocale]) 1638 if (rs[Rs_imLocale])
1587 SET_LOCALE (locale); 1639 SET_LOCALE (locale);
1588#endif
1589} 1640}
1590 1641
1591void 1642void
1592rxvt_term::IMSetPosition () 1643rxvt_term::im_set_position ()
1593{ 1644{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1645 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1646 XVaNestedList preedit_attr, status_attr;
1596 1647
1597 if (!Input_Context 1648 if (!Input_Context
1598 || !focus 1649 || !focus
1599 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1650 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1651 || !im_is_running ())
1601 return; 1652 return;
1602 1653
1603 if (input_style & XIMPreeditPosition) 1654 if (input_style & XIMPreeditPosition)
1604 { 1655 {
1605 im_set_size (preedit_rect); 1656 im_set_size (preedit_rect);
… …
1635 1686
1636void 1687void
1637rxvt_term::get_window_origin (int &x, int &y) 1688rxvt_term::get_window_origin (int &x, int &y)
1638{ 1689{
1639 Window cr; 1690 Window cr;
1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1691 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1641}
1642
1643Pixmap
1644rxvt_term::get_pixmap_property (Atom property)
1645{
1646 Pixmap pixmap = None;
1647
1648 int aformat;
1649 unsigned long nitems, bytes_after;
1650 Atom atype;
1651 unsigned char *prop;
1652 int result = XGetWindowProperty (dpy, display->root, property,
1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1654 &nitems, &bytes_after, &prop);
1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1660 }
1661
1662 return pixmap;
1663} 1692}
1664 1693
1665#ifdef HAVE_BG_PIXMAP 1694#ifdef HAVE_BG_PIXMAP
1666 1695
1667void 1696void
1668rxvt_term::update_background () 1697rxvt_term::update_background ()
1669{ 1698{
1670 if (update_background_ev.is_active ()) 1699 if (update_background_ev.is_active ())
1671 return; 1700 return;
1672 1701
1673 bgPixmap.invalidate ();
1674
1675 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1676 1703
1677 if (to_wait <= 0.) 1704 if (to_wait <= 0.)
1678 bgPixmap.render (); 1705 bg_render ();
1679 else 1706 else
1680 update_background_ev.start (to_wait); 1707 update_background_ev.start (to_wait);
1681} 1708}
1682 1709
1683void 1710void
1684rxvt_term::update_background_cb (ev::timer &w, int revents) 1711rxvt_term::update_background_cb (ev::timer &w, int revents)
1685{ 1712{
1686 make_current (); 1713 make_current ();
1687 1714
1688 update_background_ev.stop (); 1715 update_background_ev.stop ();
1689 bgPixmap.render (); 1716 bg_render ();
1690 refresh_check (); 1717 refresh_check ();
1691} 1718}
1692 1719
1693#endif /* HAVE_BG_PIXMAP */ 1720#endif /* HAVE_BG_PIXMAP */
1694 1721

Diff Legend

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