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.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.395 by root, Sat Dec 13 11:58:23 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-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2014 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
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
169 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);
170#endif 169#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 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);
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
231#endif 233#endif
232 234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
236 239
237#ifdef USE_XIM 240#if USE_XIM
238 im_destroy (); 241 im_destroy ();
239#endif 242#endif
240 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
241 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
242 247
243 delete drawable; 248 delete drawable;
249
244 // destroy all windows 250 // destroy all windows
245 if (parent[0]) 251 if (parent)
246 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
247 253
248 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
249 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
250 { 256 {
251 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
252#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
253 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
254#endif 261#endif
255 } 262 }
256 263
257 clear (); 264 clear ();
258 265
… …
265 /* clear all resources */ 272 /* clear all resources */
266 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
267 free (allocated [i]); 274 free (allocated [i]);
268 275
269 free (selection.text); 276 free (selection.text);
270 // TODO: manage env vars in child only(!) 277 free (selection.clip_text);
271 free (env_display);
272 free (env_term);
273 free (locale); 278 free (locale);
274 free (v_buffer); 279 free (v_buffer);
275 free (incr_buf); 280
281 delete selection_req;
282
283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
285
286 delete env;
276 287
277 delete envv; 288 delete envv;
278 delete argv; 289 delete argv;
279 290
280#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
281 delete keyboard; 292 delete keyboard;
282#endif 293#endif
283#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
285#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
286} 299}
287 300
288// child has exited, usually destroys 301// child has exited, usually destroys
289void 302void
290rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
313 { 326 {
314#if USE_XIM 327#if USE_XIM
315 im_ev.stop (display); 328 im_ev.stop (display);
316#endif 329#endif
317 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
319 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
320#endif 333#endif
321 incr_ev.stop ();
322 termwin_ev.stop (display); 334 termwin_ev.stop (display);
323 vt_ev.stop (display); 335 vt_ev.stop (display);
324 } 336 }
325 337
326 flush_ev.stop (); 338 flush_ev.stop ();
… …
350 make_current (); 362 make_current ();
351 363
352 delete this; 364 delete this;
353} 365}
354 366
367void
368rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
369{
370 if (!opt)
371 return;
372
373 uint8_t mask = 1 << (opt & 7);
374 uint8_t &val = options [opt >> 3];
375
376 val = val & ~mask | (set ? mask : 0);
377}
378
355/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
356/* 380/*
357 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * Exit gracefully, clearing the utmp entry and restoring tty attributes
358 * TODO: if debugging, this should free up any known resources if we can
359 */ 382 */
360static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
361 384
362static void 385static void
363rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
365 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++)
366 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
367} 390}
368 391
369#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
370static void 393static void ecb_cold
371print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
372{ 395{
373 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
374 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
375 char number[32]; 398 char number[32];
376 char *mtype = "XlibMessage"; 399
377 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401
402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
404
405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
380 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
381 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 410 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
411
412 if (event->request_code >= 128)
413 {
414#if 0
415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
416 int nexts;
417 char **exts = XListExtensions (dpy, &nexts);
418
419 while (nexts)
420 {
421 char *extname = exts [nexts - 1];
422 int major, first_event, first_error;
423
424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
425 {
426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
428
429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
431 rxvt_warn ("+ (which is %s)\n", buffer);
432
433 break;
434 }
435
436 printf ("nextss %d %s\n", nexts, extname);//D
437 --nexts;
438 ++exts;
439 }
440#else
441 int nexts = 0;
442 char **exts = 0;
443#endif
444
445 if (!nexts)
446 {
447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
448
449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
450 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
451
452#if 0
453 sprintf (number, "RENDER.%d", event->minor_code);
454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
455 rxvt_warn ("+ (which is %s)\n", buffer);
456#endif
457 }
458
459 XFreeExtensionList (exts);
460 }
461 else
462 {
383 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
384 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
385 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
386 if (event->request_code >= 128) {
387 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388 mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390 } 466 }
467
391 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
392 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
393 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
394 (event->error_code == BadFont) || 471 || event->error_code == BadFont
395 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
396 (event->error_code == BadColor) || 473 || event->error_code == BadColor
397 (event->error_code == BadGC) || 474 || event->error_code == BadGC
398 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
399 (event->error_code == BadValue) || 476 || event->error_code == BadValue
400 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
401 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
402 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
403 mesg, BUFSIZ);
404 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
405 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
406 mesg, BUFSIZ); 483 else
407 else
408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411 }
412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415}
416#endif
417 485
418int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
419rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
420{ 493{
421 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
422 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
423 else 496 else
424 { 497 {
425 // GET_R is most likely not the terminal which caused the error, 498 // GET_R is most likely not the terminal which caused the error,
426 // so just output the error and continue 499 // so just output the error and continue
… …
432 } 505 }
433 506
434 return 0; 507 return 0;
435} 508}
436 509
437int 510int ecb_cold
438rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
439{ 512{
440 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 513 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
441 DisplayString (display)); 514 DisplayString (display));
442 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
… …
465 rxvt_emergency_cleanup (); 538 rxvt_emergency_cleanup ();
466 w.stop (); 539 w.stop ();
467 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
468} 541}
469 542
543static void
544rxvt_get_ttymode (struct termios *tio)
545{
546 if (tcgetattr (STDIN_FILENO, tio) < 0)
547 memset (tio, 0, sizeof (struct termios));
548
549 for (int i = 0; i < NCCS; i++)
550 tio->c_cc[i] = VDISABLE;
551
552 tio->c_cc[VINTR] = CINTR;
553 tio->c_cc[VQUIT] = CQUIT;
554 tio->c_cc[VERASE] = CERASE;
555#ifdef VERASE2
556 tio->c_cc[VERASE2] = CERASE2;
557#endif
558 tio->c_cc[VKILL] = CKILL;
559 tio->c_cc[VEOF] = CEOF;
560 tio->c_cc[VSTART] = CSTART;
561 tio->c_cc[VSTOP] = CSTOP;
562 tio->c_cc[VSUSP] = CSUSP;
563# ifdef VDSUSP
564 tio->c_cc[VDSUSP] = CDSUSP;
565# endif
566# ifdef VREPRINT
567 tio->c_cc[VREPRINT] = CRPRNT;
568# endif
569# ifdef VDISCRD
570 tio->c_cc[VDISCRD] = CFLUSH;
571# endif
572# ifdef VWERSE
573 tio->c_cc[VWERSE] = CWERASE;
574# endif
575# ifdef VLNEXT
576 tio->c_cc[VLNEXT] = CLNEXT;
577# endif
578# ifdef VSTATUS
579 tio->c_cc[VSTATUS] = CSTATUS;
580# endif
581
582# if VMIN != VEOF
583 tio->c_cc[VMIN] = 1;
584# endif
585# if VTIME != VEOL
586 tio->c_cc[VTIME] = 0;
587# endif
588
589 /* input modes */
590 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
591# ifdef IMAXBEL
592 | IMAXBEL
593# endif
594 | IXON);
595
596 /* output modes */
597 tio->c_oflag = (OPOST | ONLCR);
598
599 /* control modes */
600 tio->c_cflag = (CS8 | CREAD);
601
602 /* local modes */
603 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
604# if defined (ECHOCTL) && defined (ECHOKE)
605 | ECHOCTL | ECHOKE
606# endif
607 | ECHOE | ECHOK);
608}
609
470char **rxvt_environ; // startup environment 610char **rxvt_environ; // startup environment
471 611
472void 612void
473rxvt_init () 613rxvt_init ()
474{ 614{
475 ptytty::init (); 615 assert (("fontMask must not overlap other RS masks",
616 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
476 617
618 rxvt_get_ttymode (&rxvt_term::def_tio);
619
620 // get rid of stdin/stdout as we don't need them, to free resources
621 dup2 (STDERR_FILENO, STDIN_FILENO);
622 dup2 (STDERR_FILENO, STDOUT_FILENO);
623
477 if (!ev_default_loop (0)) 624 if (!ev_default_loop ())
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479 626
480 rxvt_environ = environ; 627 rxvt_environ = environ;
481 628
482 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
483 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
484 631
485 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486 sig_handlers.sw_int.start (SIGINT); ev_unref (); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
489 /* signal (SIGURG, SIG_DFL); */
490 634
491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
493 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
494 638
495 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
496} 644}
497 645
498/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
499/* 647/*
500 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
522 if (rs[Rs_geometry]) 670 if (rs[Rs_geometry])
523 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 671 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
524 672
525 if (flags & WidthValue) 673 if (flags & WidthValue)
526 { 674 {
675 if (!w)
676 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
677
527 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 678 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
528 szHint.flags |= USSize; 679 szHint.flags |= USSize;
529 } 680 }
530 681
531 if (flags & HeightValue) 682 if (flags & HeightValue)
532 { 683 {
684 if (!h)
685 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
686
533 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 687 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
534 szHint.flags |= USSize; 688 szHint.flags |= USSize;
535 } 689 }
536 690
537 if (flags & XValue) 691 if (flags & XValue)
538 { 692 {
… …
559 szHint.win_gravity = SouthEastGravity; 713 szHint.win_gravity = SouthEastGravity;
560 else 714 else
561 szHint.win_gravity = SouthWestGravity; 715 szHint.win_gravity = SouthWestGravity;
562 } 716 }
563 } 717 }
564
565 if (!szHint.width || !szHint.height)
566 rxvt_fatal ("window width or height must not be zero, aborting.\n");
567 } 718 }
568 719
569 /* TODO: BOUNDS */ 720 /* TODO: BOUNDS */
570 width = ncol * fwidth; 721 width = ncol * fwidth;
571 height = nrow * fheight; 722 height = nrow * fheight;
… …
616 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 767 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
617 768
618 if (recalc_y) 769 if (recalc_y)
619 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
620 771
621 ncol = width / fwidth; 772 ncol = width / fwidth;
622 nrow = height / fheight; 773 nrow = height / fheight;
774
775 // When the size of the vt window is not a multiple of the cell
776 // size, i.e., when the wm does not honour our size hints, there are
777 // extra areas not covered by the terminal screen. Such gaps, when a
778 // bg pixmap is set, would have to be cleared manually to properly
779 // refresh the background. We take the simpler route and shrink the
780 // vt window so as to avoid creating gaps.
781 vt_width = ncol * fwidth;
782 vt_height = nrow * fheight;
623} 783}
624 784
625/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
626/* 786/*
627 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
635 795
636 struct winsize ws; 796 struct winsize ws;
637 797
638 ws.ws_col = ncol; 798 ws.ws_col = ncol;
639 ws.ws_row = nrow; 799 ws.ws_row = nrow;
640 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
641 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
642 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
643 803
644#if 0 804#if 0
645 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
646 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
647 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
648#endif 808#endif
649} 809}
650 810
651/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
652/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
653 *
654 * init = 1 - initialize
655 *
656 * fontname == FONT_UP - switch to bigger font
657 * fontname == FONT_DN - switch to smaller font
658 */
659bool 813bool
660rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
661{ 815{
662 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
663 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
677#endif 831#endif
678 832
679 delete fontset[0]; 833 delete fontset[0];
680 fontset[0] = fs; 834 fontset[0] = fs;
681 835
682 prop = (*fs)[1]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
683 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
684 838
685 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
686 840
687 fwidth = prop.width; 841 fwidth = prop.width;
688 fheight = prop.height; 842 fheight = prop.height + lineSpace;
689 fbase = prop.ascent; 843 fbase = prop.ascent;
690 844
691 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
692 { 846 {
693#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
719#else 873#else
720 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
721#endif 875#endif
722 } 876 }
723 877
724 if (parent[0]) 878 if (parent)
725 { 879 {
726 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
727 scr_remap_chars (); 881 scr_remap_chars ();
728 scr_touch (true); 882 scr_touch (true);
729 } 883 }
… …
732} 886}
733 887
734void 888void
735rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
736{ 890{
737 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
738 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
739 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
740} 894}
741 895
742void 896void
897rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
898{
899 XTextProperty ct;
900
901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
902 {
903 XSetTextProperty (dpy, parent, &ct, prop);
904 XFree (ct.value);
905 }
906}
907
908void
743rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
744{ 910{
745 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
746 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
747 913
748 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
749 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
750 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
751 917
752 free (s); 918 free (s);
753 free (ws); 919 free (ws);
… …
757/*----------------------------------------------------------------------*/ 923/*----------------------------------------------------------------------*/
758/* xterm sequences - title, iconName, color (exptl) */ 924/* xterm sequences - title, iconName, color (exptl) */
759void 925void
760rxvt_term::set_title (const char *str) 926rxvt_term::set_title (const char *str)
761{ 927{
762 set_string_property (XA_WM_NAME, str); 928 set_mbstring_property (XA_WM_NAME, str);
763#if ENABLE_EWMH 929#if ENABLE_EWMH
764 set_utf8_property (xa[XA_NET_WM_NAME], str); 930 set_utf8_property (xa[XA_NET_WM_NAME], str);
765#endif 931#endif
766} 932}
767 933
768void 934void
769rxvt_term::set_icon_name (const char *str) 935rxvt_term::set_icon_name (const char *str)
770{ 936{
771 set_string_property (XA_WM_ICON_NAME, str); 937 set_mbstring_property (XA_WM_ICON_NAME, str);
772#if ENABLE_EWMH 938#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 939 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
774#endif 940#endif
775} 941}
776 942
… …
843 1009
844/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
845/* 1011/*
846 * find if fg/bg matches any of the normal (low-intensity) colors 1012 * find if fg/bg matches any of the normal (low-intensity) colors
847 */ 1013 */
848void 1014char *
849rxvt_term::set_colorfgbg () 1015rxvt_term::get_colorfgbg ()
850{ 1016{
851 unsigned int i; 1017 unsigned int i;
852 const char *xpmb = ""; 1018 const char *xpmb = "";
853 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1019 char fstr[] = "default";
1020 char bstr[] = "default";
1021 char *env_colorfgbg;
854 1022
855 strcpy (fstr, "default");
856 strcpy (bstr, "default");
857 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
858 if (pix_colors[Color_fg] == pix_colors[i]) 1024 if (pix_colors[Color_fg] == pix_colors[i])
859 { 1025 {
860 sprintf (fstr, "%d", (i - Color_Black)); 1026 sprintf (fstr, "%d", i - Color_Black);
861 break; 1027 break;
862 } 1028 }
863 1029
864 for (i = Color_Black; i <= Color_White; i++) 1030 for (i = Color_Black; i <= Color_White; i++)
865 if (pix_colors[Color_bg] == pix_colors[i]) 1031 if (pix_colors[Color_bg] == pix_colors[i])
866 { 1032 {
867 sprintf (bstr, "%d", (i - Color_Black)); 1033 sprintf (bstr, "%d", i - Color_Black);
868#ifdef BG_IMAGE_FROM_FILE 1034#if BG_IMAGE_FROM_FILE
869 xpmb = "default;"; 1035 xpmb = "default;";
870#endif 1036#endif
871 break; 1037 break;
872 } 1038 }
873 1039
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
874 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042 return env_colorfgbg;
875} 1043}
876 1044
877/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
878 1046
879bool 1047bool
… …
902 int old_width = szHint.width; 1070 int old_width = szHint.width;
903 int old_height = szHint.height; 1071 int old_height = szHint.height;
904 1072
905 window_calc (newwidth, newheight); 1073 window_calc (newwidth, newheight);
906 1074
907 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1075 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1076
1077 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1078 if (set_hint)
1079 {
1080 szHint.flags &= ~(PBaseSize | PResizeInc);
908 XSetWMNormalHints (dpy, parent[0], &szHint); 1081 XSetWMNormalHints (dpy, parent, &szHint);
1082 szHint.flags |= PBaseSize | PResizeInc;
1083 }
909 1084
910 if (!ignoreparent) 1085 if (!ignoreparent)
911 { 1086 {
912#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
913 /* 1088 /*
… …
917 int x, y, x1, y1; 1092 int x, y, x1, y1;
918 int dx, dy; 1093 int dx, dy;
919 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
920 Window unused_cr; 1095 Window unused_cr;
921 1096
922 XTranslateCoordinates (dpy, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent, display->root,
923 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
924 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
925 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
926 /* 1101 /*
927 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
928 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
929 */ 1104 */
… …
946 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
947 dy = 0; 1122 dy = 0;
948 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
949 dy /= 2; 1124 dy /= 2;
950 1125
951 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
952 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
953#else 1128#else
954 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent, szHint.width, szHint.height);
955#endif 1130#endif
956 } 1131 }
1132
1133 if (set_hint)
1134 XSetWMNormalHints (dpy, parent, &szHint);
957 1135
958 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1136 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
959 1137
960 if (fix_screen || newwidth != old_width || newheight != old_height) 1138 if (fix_screen || newwidth != old_width || newheight != old_height)
961 { 1139 {
962 if (scrollBar.state) 1140 if (scrollBar.state)
963 scrollBar.resize (); 1141 scrollBar.resize ();
964 1142
965 XMoveResizeWindow (dpy, vt, 1143 XMoveResizeWindow (dpy, vt,
966 window_vt_x, window_vt_y, 1144 window_vt_x, window_vt_y,
967 width, height); 1145 vt_width, vt_height);
1146
1147 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
968 1148
969#ifdef HAVE_BG_PIXMAP 1149#ifdef HAVE_BG_PIXMAP
970 if (bgPixmap.window_size_sensitive ()) 1150 if (bg_window_size_sensitive ())
971 update_background (); 1151 update_background ();
972#endif 1152#endif
973
974 scr_clear ();
975 } 1153 }
976 1154
977 if (fix_screen || old_height == 0) 1155 if (fix_screen || old_height == 0)
978 scr_reset (); 1156 scr_reset ();
979 1157
980 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
981 //scr_touch (false);
982
983#ifdef HAVE_BG_PIXMAP
984// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
985// if (bgPixmap.pixmap)
986// scr_touch (false);
987#endif
988
989#ifdef USE_XIM 1158#if USE_XIM
990 IMSetPosition (); 1159 im_set_position ();
991#endif 1160#endif
992} 1161}
993 1162
994/* 1163/*
995 * Set the width/height of the vt window in characters. Units are pixels. 1164 * Set the width/height of the vt window in characters. Units are pixels.
… …
1008 newwidth = wattr.width - szHint.base_width; 1177 newwidth = wattr.width - szHint.base_width;
1009 if (newheight == 0) 1178 if (newheight == 0)
1010 newheight = wattr.height - szHint.base_height; 1179 newheight = wattr.height - szHint.base_height;
1011 } 1180 }
1012 1181
1013 if (newwidth != width || newheight != height) 1182 if (newwidth != vt_width || newheight != vt_height)
1014 { 1183 {
1015 newwidth += szHint.base_width; 1184 newwidth += szHint.base_width;
1016 newheight += szHint.base_height; 1185 newheight += szHint.base_height;
1017 resize_all_windows (newwidth, newheight, 0); 1186 resize_all_windows (newwidth, newheight, 0);
1018 } 1187 }
1019} 1188}
1020 1189
1021/* -------------------------------------------------------------------- * 1190/* -------------------------------------------------------------------- *
1022 * - X INPUT METHOD ROUTINES - * 1191 * - X INPUT METHOD ROUTINES - *
1023 * -------------------------------------------------------------------- */ 1192 * -------------------------------------------------------------------- */
1024#ifdef USE_XIM 1193#if USE_XIM
1025 1194
1026void 1195void
1027rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1196rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1028{ 1197{
1029 fg = pix_colors [Color_fg]; 1198 fg = pix_colors [Color_fg];
… …
1056 status_rect.height = fheight; 1225 status_rect.height = fheight;
1057} 1226}
1058 1227
1059/* Checking whether input method is running. */ 1228/* Checking whether input method is running. */
1060bool 1229bool
1061rxvt_term::IMisRunning () 1230rxvt_term::im_is_running ()
1062{ 1231{
1063 char *p;
1064 Atom atom; 1232 Atom atom;
1065 Window win; 1233 Window win;
1066 char server[IMBUFSIZ]; 1234 char server[IMBUFSIZ];
1067 1235
1068 /* get current locale modifier */ 1236 /* get current locale modifier */
1069 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1237 if (char *p = XSetLocaleModifiers (0))
1070 { 1238 {
1071 strcpy (server, "@server="); 1239 strcpy (server, "@server=");
1072 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1240 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1073 1241
1074 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1242 if (p = strchr (server + 1, '@')) /* first one only */
1075 *p = '\0'; 1243 *p = '\0';
1076 1244
1077 atom = XInternAtom (dpy, server, False); 1245 atom = XInternAtom (dpy, server, False);
1078 win = XGetSelectionOwner (dpy, atom); 1246 win = XGetSelectionOwner (dpy, atom);
1079 1247
1080 if (win != None) 1248 if (win != None)
1081 return True; 1249 return true;
1082 } 1250 }
1083 1251
1084 return False; 1252 return false;
1085} 1253}
1086 1254
1087void 1255void
1088rxvt_term::IMSendSpot () 1256rxvt_term::im_send_spot ()
1089{ 1257{
1090 XPoint nspot; 1258 XPoint nspot;
1091 XVaNestedList preedit_attr; 1259 XVaNestedList preedit_attr;
1092 1260
1093 if (!Input_Context 1261 if (!Input_Context
… …
1146 1314
1147 term->make_current (); 1315 term->make_current ();
1148 1316
1149 if (text) 1317 if (text)
1150 { 1318 {
1151 void *str; 1319 wchar_t *str;
1152 1320
1153 if (!text->encoding_is_wchar && text->string.multi_byte) 1321 if (!text->encoding_is_wchar && text->string.multi_byte)
1154 { 1322 {
1155 // of course, X makes it ugly again 1323 // of course, X makes it ugly again
1156 if (term->rs[Rs_imLocale]) 1324 if (term->rs[Rs_imLocale])
1157 SET_LOCALE (term->rs[Rs_imLocale]); 1325 SET_LOCALE (term->rs[Rs_imLocale]);
1158 1326
1159 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1327 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1160 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1328 mbstowcs (str, text->string.multi_byte, text->length + 1);
1161 1329
1162 if (term->rs[Rs_imLocale]) 1330 if (term->rs[Rs_imLocale])
1163 SET_LOCALE (term->locale); 1331 SET_LOCALE (term->locale);
1164 } 1332 }
1165 else 1333 else
1166 str = (void *)text->string.wide_char; 1334 str = text->string.wide_char;
1167 1335
1168 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1336 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1169 DT_INT, call_data->caret, 1337 DT_INT, call_data->caret,
1170 DT_INT, call_data->chg_first, 1338 DT_INT, call_data->chg_first,
1171 DT_INT, call_data->chg_length, 1339 DT_INT, call_data->chg_length,
… …
1199/* 1367/*
1200 * Try to open a XIM with the current modifiers, then see if we can 1368 * Try to open a XIM with the current modifiers, then see if we can
1201 * open a suitable preedit type 1369 * open a suitable preedit type
1202 */ 1370 */
1203bool 1371bool
1204rxvt_term::IM_get_IC (const char *modifiers) 1372rxvt_term::im_get_ic (const char *modifiers)
1205{ 1373{
1206 int i, j, found; 1374 int i, j, found;
1207 XIM xim; 1375 XIM xim;
1208 XPoint spot; 1376 XPoint spot;
1209 XRectangle rect, status_rect, needed_rect; 1377 XRectangle rect, status_rect, needed_rect;
1210 unsigned long fg, bg; 1378 unsigned long fg, bg;
1211 const char *p; 1379 const char *p;
1212 char **s; 1380 char **s;
1213 XIMStyles *xim_styles; 1381 XIMStyles *xim_styles;
1214#ifdef ENABLE_XIM_ONTHESPOT
1215 XIMCallback xcb[4];
1216#endif
1217 1382
1218 set_environ (envv); 1383 set_environ (env);
1219 1384
1220 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1385 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1221 return false; 1386 return false;
1222 1387
1223 input_method = display->get_xim (locale, modifiers); 1388 input_method = display->get_xim (locale, modifiers);
1224 if (input_method == NULL) 1389 if (input_method == NULL)
1225 return false; 1390 return false;
… …
1242 p = pet[pi]; 1407 p = pet[pi];
1243 1408
1244 if (!p) 1409 if (!p)
1245 continue; 1410 continue;
1246 1411
1247 s = rxvt_splitcommastring (p); 1412 s = rxvt_strsplit (',', p);
1248 1413
1249 for (i = found = 0; !found && s[i]; i++) 1414 for (i = found = 0; !found && s[i]; i++)
1250 { 1415 {
1251 if (!strcmp (s[i], "OverTheSpot")) 1416 if (!strcmp (s[i], "OverTheSpot"))
1252 input_style = XIMPreeditPosition | XIMStatusNothing; 1417 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1264 input_style = XIMPreeditNothing | XIMStatusNothing; 1429 input_style = XIMPreeditNothing | XIMStatusNothing;
1265 1430
1266 for (j = 0; j < xim_styles->count_styles; j++) 1431 for (j = 0; j < xim_styles->count_styles; j++)
1267 if (input_style == xim_styles->supported_styles[j]) 1432 if (input_style == xim_styles->supported_styles[j])
1268 { 1433 {
1269 rxvt_freecommastring (s); 1434 rxvt_free_strsplit (s);
1270 1435
1271 found = 1; 1436 found = 1;
1272 goto foundpet; 1437 goto foundpet;
1273 } 1438 }
1274 1439
1275 } 1440 }
1276 1441
1277 rxvt_freecommastring (s); 1442 rxvt_free_strsplit (s);
1278 } 1443 }
1279 1444
1280foundpet: 1445foundpet:
1281 1446
1282 XFree (xim_styles); 1447 XFree (xim_styles);
… …
1361 NULL); 1526 NULL);
1362 } 1527 }
1363#if ENABLE_XIM_ONTHESPOT 1528#if ENABLE_XIM_ONTHESPOT
1364 else if (input_style & XIMPreeditCallbacks) 1529 else if (input_style & XIMPreeditCallbacks)
1365 { 1530 {
1531 XIMCallback xcb[4];
1532
1366 im_set_position (spot); 1533 im_set_position (spot);
1367 1534
1368 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1535 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1369 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1536 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1370 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1537 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1385#endif 1552#endif
1386 1553
1387 Input_Context = XCreateIC (xim, 1554 Input_Context = XCreateIC (xim,
1388 XNInputStyle, input_style, 1555 XNInputStyle, input_style,
1389 XNClientWindow, vt, 1556 XNClientWindow, vt,
1390 XNFocusWindow, parent[0], 1557 XNFocusWindow, parent,
1391 preedit_attr ? XNPreeditAttributes : NULL, 1558 preedit_attr ? XNPreeditAttributes : NULL,
1392 preedit_attr, 1559 preedit_attr,
1393 status_attr ? XNStatusAttributes : NULL, 1560 status_attr ? XNStatusAttributes : NULL,
1394 status_attr, NULL); 1561 status_attr, NULL);
1395 1562
… …
1408 // unfortunately, only the focus window is used by XIM, hard to fix 1575 // unfortunately, only the focus window is used by XIM, hard to fix
1409 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1576 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1410 vt_select_input (); 1577 vt_select_input ();
1411#endif 1578#endif
1412 1579
1413 IMSetPosition (); 1580 im_set_position ();
1414 1581
1415 return true; 1582 return true;
1416} 1583}
1417 1584
1418void 1585void
… …
1428 im_destroy (); 1595 im_destroy ();
1429 1596
1430 if (Input_Context) 1597 if (Input_Context)
1431 return; 1598 return;
1432 1599
1433#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1434 if (rs[Rs_imLocale]) 1600 if (rs[Rs_imLocale])
1435 SET_LOCALE (rs[Rs_imLocale]); 1601 SET_LOCALE (rs[Rs_imLocale]);
1436#endif
1437 1602
1438 p = rs[Rs_inputMethod]; 1603 p = rs[Rs_inputMethod];
1439 if (p && *p) 1604 if (p && *p)
1440 { 1605 {
1441 bool found = false; 1606 bool found = false;
1442 1607
1443 s = rxvt_splitcommastring (p); 1608 s = rxvt_strsplit (',', p);
1444 1609
1445 for (i = 0; s[i]; i++) 1610 for (i = 0; s[i]; i++)
1446 { 1611 {
1447 if (*s[i]) 1612 if (*s[i])
1448 { 1613 {
1449 strcpy (buf, "@im="); 1614 strcpy (buf, "@im=");
1450 strncat (buf, s[i], IMBUFSIZ - 5); 1615 strncat (buf, s[i], IMBUFSIZ - 5);
1451 if (IM_get_IC (buf)) 1616 if (im_get_ic (buf))
1452 { 1617 {
1453 found = true; 1618 found = true;
1454 break; 1619 break;
1455 } 1620 }
1456 } 1621 }
1457 } 1622 }
1458 1623
1459 rxvt_freecommastring (s); 1624 rxvt_free_strsplit (s);
1460 1625
1461 if (found) 1626 if (found)
1462 goto done; 1627 goto done;
1463 } 1628 }
1464 1629
1465 /* try with XMODIFIERS env. var. */ 1630 /* try with XMODIFIERS env. var. */
1466 if (IM_get_IC ("")) 1631 if (im_get_ic (""))
1467 goto done; 1632 goto done;
1468 1633
1469 /* try with no modifiers base IF the user didn't specify an IM */ 1634 /* try with no modifiers base IF the user didn't specify an IM */
1470 if (IM_get_IC ("@im=none")) 1635 if (im_get_ic ("@im=none"))
1471 goto done; 1636 goto done;
1472 1637
1473done: 1638done:
1474#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1475 if (rs[Rs_imLocale]) 1639 if (rs[Rs_imLocale])
1476 SET_LOCALE (locale); 1640 SET_LOCALE (locale);
1477#endif
1478} 1641}
1479 1642
1480void 1643void
1481rxvt_term::IMSetPosition () 1644rxvt_term::im_set_position ()
1482{ 1645{
1483 XRectangle preedit_rect, status_rect, *needed_rect; 1646 XRectangle preedit_rect, status_rect, *needed_rect;
1484 XVaNestedList preedit_attr, status_attr; 1647 XVaNestedList preedit_attr, status_attr;
1485 1648
1486 if (!Input_Context 1649 if (!Input_Context
1487 || !focus 1650 || !focus
1488 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1651 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1489 || !IMisRunning ()) 1652 || !im_is_running ())
1490 return; 1653 return;
1491 1654
1492 if (input_style & XIMPreeditPosition) 1655 if (input_style & XIMPreeditPosition)
1493 { 1656 {
1494 im_set_size (preedit_rect); 1657 im_set_size (preedit_rect);
… …
1524 1687
1525void 1688void
1526rxvt_term::get_window_origin (int &x, int &y) 1689rxvt_term::get_window_origin (int &x, int &y)
1527{ 1690{
1528 Window cr; 1691 Window cr;
1529 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1692 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1530/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1531}
1532
1533Pixmap
1534rxvt_term::get_pixmap_property (int prop_id)
1535{
1536 if (prop_id > 0 && prop_id < NUM_XA)
1537 if (xa[prop_id])
1538 {
1539 int aformat;
1540 unsigned long nitems, bytes_after;
1541 Atom atype;
1542 unsigned char *prop = NULL;
1543 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1544 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1545 &nitems, &bytes_after, &prop);
1546 if (result == Success && prop && atype == XA_PIXMAP)
1547 return *(Pixmap *)prop;
1548 }
1549
1550 return None;
1551} 1693}
1552 1694
1553#ifdef HAVE_BG_PIXMAP 1695#ifdef HAVE_BG_PIXMAP
1554# if TRACE_PIXMAPS
1555# undef update_background
1556void
1557rxvt_term::trace_update_background (const char *file, int line)
1558{
1559 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1560 update_background ();
1561}
1562# endif
1563 1696
1564void 1697void
1565rxvt_term::update_background () 1698rxvt_term::update_background ()
1566{ 1699{
1567 if (update_background_ev.is_active ()) 1700 if (update_background_ev.is_active ())
1568 return; 1701 return;
1569 1702
1570 bgPixmap.invalidate ();
1571
1572 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1703 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1573 1704
1574 if (to_wait <= 0.) 1705 if (to_wait <= 0.)
1575 bgPixmap.render (); 1706 bg_render ();
1576 else 1707 else
1577 update_background_ev.start (to_wait); 1708 update_background_ev.start (to_wait);
1578} 1709}
1579 1710
1580void 1711void
1581rxvt_term::update_background_cb (ev::timer &w, int revents) 1712rxvt_term::update_background_cb (ev::timer &w, int revents)
1582{ 1713{
1583 make_current (); 1714 make_current ();
1584 1715
1585 update_background_ev.stop (); 1716 update_background_ev.stop ();
1586 bgPixmap.render (); 1717 bg_render ();
1587 refresh_check (); 1718 refresh_check ();
1588} 1719}
1589 1720
1590#endif /* HAVE_BG_PIXMAP */ 1721#endif /* HAVE_BG_PIXMAP */
1591 1722

Diff Legend

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