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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines