ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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