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.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

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

Diff Legend

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