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.209 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.375 by sf-exg, Sun Jun 3 17:48:28 2012 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-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 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
49#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
55 59
56static char curlocale[128], savelocale[128]; 60static char curlocale[128], savelocale[128];
57 61
58bool 62bool
59rxvt_set_locale (const char *locale) NOTHROW 63rxvt_set_locale (const char *locale) NOTHROW
60{ 64{
65 int size = strlen (locale) + 1;
66
67 if (size > sizeof (curlocale))
68 rxvt_fatal ("locale string too long, aborting.\n");
69
61 if (!locale || !strncmp (locale, curlocale, 128)) 70 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 71 return false;
63 72
64 strncpy (curlocale, locale, 128); 73 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 74 setlocale (LC_CTYPE, curlocale);
66 return true; 75 return true;
67} 76}
68 77
69void 78void
… …
83class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
84 93
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 95{
87 compose_char *cc; 96 compose_char *cc;
88 97
89 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
91 cc = (*this)[c1]; 100 cc = (*this)[c1];
92 while (cc) 101 while (cc)
93 { 102 {
94 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
96 } 105 }
97 106
98 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
100 {
101 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
103 }
104 111
105 // allocate a new combination 112 // allocate a new combination
106 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
107 { 114 {
108 static int seen; 115 static int seen;
109 116
110 if (!seen++) 117 if (!seen++)
111 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
112 119
113 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
114 } 121 }
115 122
116 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
142 149
143} 150}
144#endif 151#endif
145 152
146rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
147 : 154{
148#if TRANSPARENT 155#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 157#endif
154#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 160#endif
157#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 163#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 166#endif
163#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 169#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
173#if ENABLE_TRANSPARENCY || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#ifdef USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 179#endif
169#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 182#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 183#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 185#endif
178 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 192
185 incr_ev (this, &rxvt_term::incr_cb)
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 194
189 termlist.push_back (this); 195 termlist.push_back (this);
190 196
191#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
193#endif 199#endif
194} 200}
195 201
196// clean up the most important stuff, do *not* call x or free mem etc. 202// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 203// for use before an emergency exit
204void
198void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
199{ 206{
200 if (cmd_pid) 207 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
202 209
210 pty_ev.stop ();
203 delete pty; pty = 0; 211 delete pty; pty = 0;
204} 212}
205 213
206rxvt_term::~rxvt_term () 214rxvt_term::~rxvt_term ()
207{ 215{
… …
214 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
215 delete fontset[i]; 223 delete fontset[i];
216#endif 224#endif
217 delete fontset[0]; 225 delete fontset[0];
218 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
219 if (display) 231 if (display)
220 { 232 {
221 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
222 235
223#ifdef USE_XIM 236#ifdef USE_XIM
224 im_destroy (); 237 im_destroy ();
225#endif 238#endif
226#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif
230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif
233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif
245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif
250 if (gc) XFreeGC (xdisp, gc); 240 if (gc) XFreeGC (dpy, gc);
251 241
252 delete drawable; 242 delete drawable;
253 // destroy all windows 243 // destroy all windows
254 if (parent[0]) 244 if (parent)
255 XDestroyWindow (xdisp, parent[0]); 245 XDestroyWindow (dpy, parent);
246
247 for (int i = 0; i < TOTAL_COLORS; i++)
248 if (ISSET_PIXCOLOR (i))
249 {
250 pix_colors_focused [i].free (this);
251#if OFF_FOCUS_FADING
252 pix_colors_unfocused [i].free (this);
253#endif
254 }
256 255
257 clear (); 256 clear ();
258 }
259 257
260 // TODO: free pixcolours, colours should become part of rxvt_display 258 display->flush (); /* ideally .put should do this */
261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused;
264#endif
265
266 displays.put (display); 259 displays.put (display);
260 }
267 261
268 scr_release (); 262 scr_release ();
269 263
270 /* clear all resources */ 264 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 266 free (allocated [i]);
273 267
274 free (selection.text); 268 free (selection.text);
275 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
276 free (env_display);
277 free (env_term);
278 free (locale); 270 free (locale);
279 free (v_buffer); 271 free (v_buffer);
280 free (incr_buf); 272
273 delete selection_req;
281 274
282 delete envv; 275 delete envv;
283 delete argv; 276 delete argv;
284 277
285#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
286 delete keyboard; 279 delete keyboard;
287#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
288} 284}
289 285
290// child has exited, usually destroys 286// child has exited, usually destroys
291void 287void
292rxvt_term::child_cb (child_watcher &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
293{ 289{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 290 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 291
296 cmd_pid = 0; 292 cmd_pid = 0;
297 293
298 if (!OPTION (Opt_hold)) 294 if (!option (Opt_hold))
299 destroy (); 295 destroy ();
300} 296}
301 297
302void 298void
303rxvt_term::destroy () 299rxvt_term::destroy ()
304{ 300{
305 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
306 return; 302 return;
307 303
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 305
310#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
314 if (display) 310 if (display)
315 { 311 {
316#if USE_XIM 312#if USE_XIM
317 im_ev.stop (display); 313 im_ev.stop (display);
318#endif 314#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
321#endif 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
324#endif 318#endif
325 incr_ev.stop ();
326 termwin_ev.stop (display); 319 termwin_ev.stop (display);
327 vt_ev.stop (display); 320 vt_ev.stop (display);
328 } 321 }
329 322
330 check_ev.stop (); 323 flush_ev.stop ();
331 pty_ev.stop (); 324 pty_ev.stop ();
332#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
334#endif 327#endif
335#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
343#endif 336#endif
344#ifdef POINTER_BLANK 337#ifdef POINTER_BLANK
345 pointer_ev.stop (); 338 pointer_ev.stop ();
346#endif 339#endif
347 340
348 destroy_ev.start (0); 341 destroy_ev.start ();
349} 342}
350 343
351void 344void
352rxvt_term::destroy_cb (time_watcher &w) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 346{
354 make_current (); 347 make_current ();
355 348
356 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
357} 362}
358 363
359/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
360/* 365/*
361 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
371} 376}
372 377
373#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
374static void 379static void ecb_cold
375print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
376{ 381{
377 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
379 char number[32]; 384 char number[32];
380 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
384 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
387 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
392 mesg, BUFSIZ); 397 mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
394 } 399 }
395 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
396 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
397 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
398 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
399 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
400 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
401 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
402 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
403 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
404 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
405 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
407 mesg, BUFSIZ); 412 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
410 mesg, BUFSIZ); 415 mesg, BUFSIZ);
411 else 416 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 418 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 420 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 422 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 424}
420#endif 425#endif
421 426
422int 427int ecb_cold
423rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
424{ 429{
425 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
426 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
427 else 432 else
… …
436 } 441 }
437 442
438 return 0; 443 return 0;
439} 444}
440 445
441int 446int ecb_cold
442rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
443{ 448{
444 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
445 DisplayString (display)); 450 DisplayString (display));
446 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
448} 453}
449 454
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 init_xlocale ();
481
482 scr_reset (); // initialize screen
483
484#if 0
485 XSynchronize (xdisp, True);
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */
491#endif
492#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent))
494 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root);
498 }
499#endif
500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
527 return true;
528}
529
530static struct sig_handlers 455static struct sig_handlers
531{ 456{
532 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
533 458
534 /* 459 /*
535 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
536 */ 461 */
537 void 462 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 463
464 sig_handlers ()
539 { 465 {
540 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
541 signal (w.signum, SIG_DFL);
542 kill (getpid (), w.signum);
543 }
544
545 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 468 }
550} sig_handlers; 469} sig_handlers;
551 470
471void
472sig_handlers::sig_term (ev::sig &w, int revents)
473{
474 rxvt_emergency_cleanup ();
475 w.stop ();
476 kill (getpid (), w.signum);
477}
478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
552char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
553 547
554void 548void
555rxvt_init () 549rxvt_init ()
556{ 550{
557 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
560 if (!ev_default_loop ())
561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 562
559 rxvt_environ = environ; 563 rxvt_environ = environ;
560 564
561 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
563 567
564 sig_handlers.sw_term.start (SIGTERM); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */
569 570
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
571 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
572 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
573 574
574 XrmInitialize (); 575 XrmInitialize ();
575}
576 576
577/* ------------------------------------------------------------------------- * 577#ifdef HAVE_PIXBUF
578 * MEMORY ALLOCATION WRAPPERS * 578 g_type_init ();
579 * ------------------------------------------------------------------------- */ 579#endif
580void *
581rxvt_malloc (size_t size)
582{
583 void *p = malloc (size);
584
585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
588 return p;
589}
590
591void *
592rxvt_calloc (size_t number, size_t size)
593{
594 void *p = calloc (number, size);
595
596 if (!p)
597 rxvt_fatal ("memory allocation failure. aborting.\n");
598
599 return p;
600}
601
602void *
603rxvt_realloc (void *ptr, size_t size)
604{
605 void *p = realloc (ptr, size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611} 580}
612 581
613/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
614/* 583/*
615 * window size/position calculcations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 585 * if width/height are non-zero then override calculated width/height
617 */ 586 */
618void 587void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 589{
621 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
622 int x, y, sb_w, flags; 591 int x, y, flags;
623 unsigned int w, h; 592 unsigned int w, h;
624 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
625 594
626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
627 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
… …
637 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
638 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
639 608
640 if (flags & WidthValue) 609 if (flags & WidthValue)
641 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
642 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
643 szHint.flags |= USSize; 615 szHint.flags |= USSize;
644 } 616 }
645 617
646 if (flags & HeightValue) 618 if (flags & HeightValue)
647 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
648 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
649 szHint.flags |= USSize; 624 szHint.flags |= USSize;
650 } 625 }
651 626
652 if (flags & XValue) 627 if (flags & XValue)
653 { 628 {
… …
684 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
685 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
686 661
687 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
688 663
689 sb_w = 0;
690 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
691 665
692 if (scrollBar.state) 666 if (scrollBar.state)
693 { 667 {
694 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
695 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
670
696 if (!OPTION (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 672 window_vt_x += sb_w;
698 } 673 }
699 674
700 szHint.width_inc = fwidth; 675 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 676 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 677 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 678 szHint.min_height = szHint.base_height + szHint.height_inc;
704 679
705 if (newwidth && newwidth - szHint.base_width < max_width) 680 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 681 {
707 szHint.width = newwidth; 682 szHint.width = newwidth;
… …
722 { 697 {
723 min_it (height, max_height); 698 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
725 } 700 }
726 701
727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w;
729
730 if (recalc_x) 702 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 704
733 if (recalc_y) 705 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 707
736 ncol = width / fwidth; 708 ncol = width / fwidth;
737 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
738} 719}
739 720
740/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
741/* 722/*
742 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
750 731
751 struct winsize ws; 732 struct winsize ws;
752 733
753 ws.ws_col = ncol; 734 ws.ws_col = ncol;
754 ws.ws_row = nrow; 735 ws.ws_row = nrow;
755 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
756 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
758 739
759#if 0 740#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
763#endif 744#endif
764} 745}
765 746
766/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
767/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
768 *
769 * init = 1 - initialize
770 *
771 * fontname == FONT_UP - switch to bigger font
772 * fontname == FONT_DN - switch to smaller font
773 */
774bool 749bool
775rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
776{ 751{
777 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
778 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
792#endif 767#endif
793 768
794 delete fontset[0]; 769 delete fontset[0];
795 fontset[0] = fs; 770 fontset[0] = fs;
796 771
797 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
798 prop.height += lineSpace; 773 prop.width += letterSpace;
774
799 fs->set_prop (prop); 775 fs->set_prop (prop, false);
800 776
801 fwidth = prop.width; 777 fwidth = prop.width;
802 fheight = prop.height; 778 fheight = prop.height + lineSpace;
803 fbase = prop.ascent; 779 fbase = prop.ascent;
804 780
805 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
806 { 782 {
807#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
813 { 789 {
814 fontset[style] = fs = new rxvt_fontset (this); 790 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 791 rxvt_fontprop prop2 = prop;
816 792
817 if (res) 793 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 794 {
795 fs->populate (res);
796 fs->set_prop (prop2, false);
797 }
819 else 798 else
820 { 799 {
821 res = fontset[0]->fontdesc; 800 fs->populate (fontset[0]->fontdesc);
822 801
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 802 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 803 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
804
805 fs->set_prop (prop2, true);
825 } 806 }
826 807
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 808 }
830#else 809#else
831 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
832#endif 811#endif
833 } 812 }
834 813
835 if (parent[0]) 814 if (parent)
836 { 815 {
837 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 817 scr_remap_chars ();
839 scr_touch (true); 818 scr_touch (true);
840 } 819 }
841 820
842 return true; 821 return true;
843} 822}
844 823
824void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 826{
847 XChangeProperty (xdisp, parent[0], 827 XChangeProperty (dpy, parent,
848 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 830}
851 831
832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 846{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
856 849
857 XChangeProperty (xdisp, parent[0], 850 XChangeProperty (dpy, parent,
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
860 853
861 free (s); 854 free (s);
862 free (ws); 855 free (ws);
… …
866/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
867/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
868void 861void
869rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
870{ 863{
871 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
872#if ENABLE_EWMH 865#if ENABLE_EWMH
873 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
874#endif 867#endif
875} 868}
876 869
877void 870void
878rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
879{ 872{
880 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
881#if ENABLE_EWMH 874#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 876#endif
884} 877}
885 878
879void
880rxvt_term::set_window_color (int idx, const char *color)
881{
886#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 883 rxvt_color xcol;
891 int i;
892 884
893 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
894 return; 886 return;
895 887
888 color = strdup (color);
889 allocated.push_back ((void *)color);
890 rs[Rs_color + idx] = color;
891
896 /* handle color aliases */ 892 /* handle color aliases */
897 if (isdigit (*color)) 893 if (isdigit (*color))
898 { 894 {
899 i = atoi (color); 895 int i = atoi (color);
900 896
901 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
898 {
902 { /* bright colors */ 899 /* bright colors */
903 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
905 SET_PIXCOLOR (idx);
906 goto done; 901 goto done;
907 } 902 }
908 903
909 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
905 {
910 { /* normal colors */ 906 /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 907 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 908 goto done;
914 } 909 }
915 } 910 }
916 911
917 if (!set_color (xcol, color)) 912 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 913
922 /* 914 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 915 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 916 * so just keep gobbling up the colormap
925 */ 917 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 918
938 pix_colors_focused[idx] = xcol; 919 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 920
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 921done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 922 /*TODO: handle Color_BD, scrollbar background, etc. */
951 923
924 update_fade_color (idx);
952 recolour_cursor (); 925 recolour_cursor ();
953 scr_recolour (); 926 scr_recolour ();
927#endif /* XTERM_COLOR_CHANGE */
954} 928}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 929
960void 930void
961rxvt_term::recolour_cursor () 931rxvt_term::recolour_cursor ()
962{ 932{
963 XColor xcol[2]; 933 XColor fg, bg;
964 934
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 935 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 936 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 937 : pix_colors_focused[Color_fg]).get (fg);
938
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 939 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 940 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 941 : pix_colors_focused[Color_bg]).get (bg);
971 942
972 XQueryColors (xdisp, cmap, xcol, 2);
973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 943 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 944}
975 945
976/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
977/* 947/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
979 */ 949 */
980void 950char *
981rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
982{ 952{
983 unsigned int i; 953 unsigned int i;
984 const char *xpmb = "\0"; 954 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
986 958
987 strcpy (fstr, "default");
988 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
990 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
991 { 961 {
992 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
993 break; 963 break;
994 } 964 }
995 965
996 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
998 { 968 {
999 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
1000#ifdef XPM_BACKGROUND 970#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 971 xpmb = "default;";
1002#endif 972#endif
1003 break; 973 break;
1004 } 974 }
1005 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
1007} 979}
1008 980
1009/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1010 982
1011bool 983bool
… …
1014 if (color.set (this, name)) 986 if (color.set (this, name))
1015 return true; 987 return true;
1016 988
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 989 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false; 990 return false;
991}
992
993void
994rxvt_term::alias_color (int dst, int src)
995{
996 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1019} 997}
1020 998
1021/* -------------------------------------------------------------------- * 999/* -------------------------------------------------------------------- *
1022 * - WINDOW RESIZING - * 1000 * - WINDOW RESIZING - *
1023 * -------------------------------------------------------------------- */ 1001 * -------------------------------------------------------------------- */
… …
1027 int fix_screen; 1005 int fix_screen;
1028 int old_width = szHint.width; 1006 int old_width = szHint.width;
1029 int old_height = szHint.height; 1007 int old_height = szHint.height;
1030 1008
1031 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
1010
1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1032 XSetWMNormalHints (xdisp, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
1033 1020
1034 if (!ignoreparent) 1021 if (!ignoreparent)
1035 { 1022 {
1036#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
1037 /* 1024 /*
… …
1041 int x, y, x1, y1; 1028 int x, y, x1, y1;
1042 int dx, dy; 1029 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 1031 Window unused_cr;
1045 1032
1046 XTranslateCoordinates (xdisp, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1047 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 1037 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1053 */ 1040 */
… …
1055 { 1042 {
1056 x -= x1; 1043 x -= x1;
1057 y -= y1; 1044 y -= y1;
1058 } 1045 }
1059 1046
1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1047 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1048 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1062 dx = old_width - szHint.width; 1049 dx = old_width - szHint.width;
1063 dy = old_height - szHint.height; 1050 dy = old_height - szHint.height;
1064 1051
1065 /* Check position of the center of the window */ 1052 /* Check position of the center of the window */
1066 if (x < x1) /* left half */ 1053 if (x < x1) /* left half */
… …
1070 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1071 dy = 0; 1058 dy = 0;
1072 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1073 dy /= 2; 1060 dy /= 2;
1074 1061
1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1076 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1077#else 1064#else
1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1079#endif 1066#endif
1080 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
1081 1071
1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 1073
1084 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 1075 {
1086 if (scrollBar.state) 1076 if (scrollBar.state)
1087 { 1077 scrollBar.resize ();
1088 XMoveResizeWindow (xdisp, scrollBar.win,
1089 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar ();
1092 }
1093 1078
1094 XMoveResizeWindow (xdisp, vt, 1079 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1096 width, height); 1081 vt_width, vt_height);
1097 1082
1098 scr_clear (); 1083#ifdef HAVE_BG_PIXMAP
1099#ifdef XPM_BACKGROUND 1084 if (bg_window_size_sensitive ())
1100 resize_pixmap (); 1085 update_background ();
1101#endif 1086#endif
1102 } 1087 }
1103 1088
1104 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1105 scr_reset (); 1090 scr_reset ();
1106 1091
1107#ifdef XPM_BACKGROUND
1108 if (pixmap)
1109 scr_touch (false);
1110#endif
1111
1112#ifdef USE_XIM 1092#ifdef USE_XIM
1113 IMSetStatusPosition (); 1093 im_set_position ();
1114#endif 1094#endif
1115} 1095}
1116 1096
1117/* 1097/*
1118 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123{ 1103{
1124 XWindowAttributes wattr; 1104 XWindowAttributes wattr;
1125 1105
1126 if (newwidth == 0 || newheight == 0) 1106 if (newwidth == 0 || newheight == 0)
1127 { 1107 {
1128 XGetWindowAttributes (xdisp, display->root, &wattr); 1108 XGetWindowAttributes (dpy, display->root, &wattr);
1129 1109
1130 if (newwidth == 0) 1110 if (newwidth == 0)
1131 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1132 if (newheight == 0) 1112 if (newheight == 0)
1133 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1134 } 1114 }
1135 1115
1136 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1137 { 1117 {
1138 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1139 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1140 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1141 } 1121 }
… …
1147#ifdef USE_XIM 1127#ifdef USE_XIM
1148 1128
1149void 1129void
1150rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1151{ 1131{
1152 fg = pix_colors[Color_fg]; 1132 fg = pix_colors [Color_fg];
1153 bg = pix_colors[Color_bg]; 1133 bg = pix_colors [Color_bg];
1154} 1134}
1155 1135
1156void 1136void
1157rxvt_term::im_set_size (XRectangle &size) 1137rxvt_term::im_set_size (XRectangle &size)
1158{ 1138{
… …
1179 status_rect.height = fheight; 1159 status_rect.height = fheight;
1180} 1160}
1181 1161
1182/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1183bool 1163bool
1184rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1185{ 1165{
1186 char *p;
1187 Atom atom; 1166 Atom atom;
1188 Window win; 1167 Window win;
1189 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1190 1169
1191 /* get current locale modifier */ 1170 /* get current locale modifier */
1192 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1193 { 1172 {
1194 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1196 1175
1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1198 *p = '\0'; 1177 *p = '\0';
1199 1178
1200 atom = XInternAtom (xdisp, server, False); 1179 atom = XInternAtom (dpy, server, False);
1201 win = XGetSelectionOwner (xdisp, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1202 1181
1203 if (win != None) 1182 if (win != None)
1204 return True; 1183 return true;
1205 } 1184 }
1206 1185
1207 return False; 1186 return false;
1208} 1187}
1209 1188
1210void 1189void
1211rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1212{ 1191{
1213 XPoint nspot; 1192 XPoint nspot;
1214 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1215 1194
1216 if (!Input_Context 1195 if (!Input_Context
… …
1269 1248
1270 term->make_current (); 1249 term->make_current ();
1271 1250
1272 if (text) 1251 if (text)
1273 { 1252 {
1274 void *str; 1253 wchar_t *str;
1275 1254
1276 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1277 { 1256 {
1278 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1279 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1280 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1281 1260
1282 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1283 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1284 1263
1285 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1287 } 1266 }
1288 else 1267 else
1289 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1290 1269
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
1295 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1274 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1322/* 1301/*
1323 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1324 * open a suitable preedit type 1303 * open a suitable preedit type
1325 */ 1304 */
1326bool 1305bool
1327rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1328{ 1307{
1329 int i, j, found; 1308 int i, j, found;
1330 XIM xim; 1309 XIM xim;
1331 XPoint spot; 1310 XPoint spot;
1332 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1333 unsigned long fg, bg; 1312 unsigned long fg, bg;
1334 const char *p; 1313 const char *p;
1335 char **s; 1314 char **s;
1336 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1337#ifdef ENABLE_XIM_ONTHESPOT
1338 XIMCallback xcb[4];
1339#endif
1340 1316
1341 set_environ (envv); 1317 set_environ (envv);
1342 1318
1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1344 return false; 1320 return false;
… …
1365 p = pet[pi]; 1341 p = pet[pi];
1366 1342
1367 if (!p) 1343 if (!p)
1368 continue; 1344 continue;
1369 1345
1370 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1371 1347
1372 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1373 { 1349 {
1374 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1375 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1387 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1388 1364
1389 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1390 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1391 { 1367 {
1392 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1393 1369
1394 found = 1; 1370 found = 1;
1395 goto foundpet; 1371 goto foundpet;
1396 } 1372 }
1397 1373
1398 } 1374 }
1399 1375
1400 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1401 } 1377 }
1402 1378
1403foundpet: 1379foundpet:
1404 1380
1405 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1430 "*", 1406 "*",
1431 fheight, 1407 fheight,
1432 fheight + 1, fheight - 1, 1408 fheight + 1, fheight - 1,
1433 fheight - 2, fheight + 2); 1409 fheight - 2, fheight + 2);
1434 1410
1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1411 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1436 &missing_charset_list, &missing_charset_count, &def_string); 1412 &missing_charset_list, &missing_charset_count, &def_string);
1437 1413
1438 if (missing_charset_list) 1414 if (missing_charset_list)
1439 XFreeStringList (missing_charset_list); 1415 XFreeStringList (missing_charset_list);
1440 1416
… …
1484 NULL); 1460 NULL);
1485 } 1461 }
1486#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1487 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1488 { 1464 {
1465 XIMCallback xcb[4];
1466
1489 im_set_position (spot); 1467 im_set_position (spot);
1490 1468
1491 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1492 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1493 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1508#endif 1486#endif
1509 1487
1510 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1511 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1512 XNClientWindow, vt, 1490 XNClientWindow, vt,
1513 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1514 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1515 preedit_attr, 1493 preedit_attr,
1516 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1517 status_attr, NULL); 1495 status_attr, NULL);
1518 1496
1519 if (preedit_attr) XFree (preedit_attr); 1497 if (preedit_attr) XFree (preedit_attr);
1520 if (status_attr) XFree (status_attr); 1498 if (status_attr) XFree (status_attr);
1521 if (fs) XFreeFontSet (xdisp, fs); 1499 if (fs) XFreeFontSet (dpy, fs);
1522 1500
1523 if (Input_Context == NULL) 1501 if (Input_Context == NULL)
1524 { 1502 {
1525 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1503 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1526 im_destroy (); 1504 im_destroy ();
… …
1531 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input (); 1511 vt_select_input ();
1534#endif 1512#endif
1535 1513
1536 if (input_style & XIMPreeditArea) 1514 im_set_position ();
1537 IMSetStatusPosition ();
1538 1515
1539 return true; 1516 return true;
1540} 1517}
1541 1518
1542void 1519void
… …
1552 im_destroy (); 1529 im_destroy ();
1553 1530
1554 if (Input_Context) 1531 if (Input_Context)
1555 return; 1532 return;
1556 1533
1557#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1558 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1559 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1560#endif
1561 1536
1562 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1563 if (p && *p) 1538 if (p && *p)
1564 { 1539 {
1565 bool found = false; 1540 bool found = false;
1566 1541
1567 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1568 1543
1569 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1570 { 1545 {
1571 if (*s[i]) 1546 if (*s[i])
1572 { 1547 {
1573 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1574 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1575 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1576 { 1551 {
1577 found = true; 1552 found = true;
1578 break; 1553 break;
1579 } 1554 }
1580 } 1555 }
1581 } 1556 }
1582 1557
1583 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1584 1559
1585 if (found) 1560 if (found)
1586 goto done; 1561 goto done;
1587 } 1562 }
1588 1563
1589 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1590 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1591 goto done; 1566 goto done;
1592 1567
1593 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1594 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1595 goto done; 1570 goto done;
1596 1571
1597done: 1572done:
1598#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1599 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1600 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1601#endif
1602} 1575}
1603 1576
1604void 1577void
1605rxvt_term::IMSetStatusPosition () 1578rxvt_term::im_set_position ()
1606{ 1579{
1607 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1608 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1609 1582
1610 if (!Input_Context 1583 if (!Input_Context
1611 || !focus 1584 || !focus
1612 || !(input_style & XIMPreeditArea) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1613 || !IMisRunning ()) 1586 || !im_is_running ())
1614 return; 1587 return;
1615 1588
1589 if (input_style & XIMPreeditPosition)
1590 {
1591 im_set_size (preedit_rect);
1592 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1593
1594 XSetICValues (Input_Context,
1595 XNPreeditAttributes, preedit_attr, NULL);
1596 }
1597 else
1598 {
1616 /* Getting the necessary width of preedit area */ 1599 /* Getting the necessary width of preedit area */
1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1600 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1601 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1619 XFree (status_attr); 1602 XFree (status_attr);
1620 1603
1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1604 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1622 XFree (needed_rect); 1605 XFree (needed_rect);
1623 1606
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1607 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1608 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1626 1609
1627 XSetICValues (Input_Context, 1610 XSetICValues (Input_Context,
1628 XNPreeditAttributes, preedit_attr, 1611 XNPreeditAttributes, preedit_attr,
1629 XNStatusAttributes, status_attr, NULL); 1612 XNStatusAttributes, status_attr,
1613 NULL);
1630 1614
1615 XFree (status_attr);
1616 }
1617
1631 XFree (preedit_attr); 1618 XFree (preedit_attr);
1632 XFree (status_attr);
1633} 1619}
1634#endif /* USE_XIM */ 1620#endif /* USE_XIM */
1621
1622void
1623rxvt_term::get_window_origin (int &x, int &y)
1624{
1625 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627}
1628
1629#ifdef HAVE_BG_PIXMAP
1630
1631void
1632rxvt_term::update_background ()
1633{
1634 if (update_background_ev.is_active ())
1635 return;
1636
1637 bg_invalidate ();
1638
1639 if (!mapped)
1640 return;
1641
1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1643
1644 if (to_wait <= 0.)
1645 bg_render ();
1646 else
1647 update_background_ev.start (to_wait);
1648}
1649
1650void
1651rxvt_term::update_background_cb (ev::timer &w, int revents)
1652{
1653 make_current ();
1654
1655 update_background_ev.stop ();
1656 bg_render ();
1657 refresh_check ();
1658}
1659
1660#endif /* HAVE_BG_PIXMAP */
1635 1661
1636/*----------------------- end-of-file (C source) -----------------------*/ 1662/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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