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

Diff Legend

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