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.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.372 by sf-exg, Sat Jan 28 15:18:29 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines