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.247 by ayin, Tue Aug 28 16:56:40 2007 UTC vs.
Revision 1.403 by root, Thu Jun 17 00:49:20 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 ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
163 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);
164#endif 161#endif
165#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
166 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);
167#endif 164#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
170#endif 167#endif
171#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173#endif 170#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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),
176#endif 180#endif
177#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 183#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 184#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 186#endif
186 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 193
193 incr_ev (this, &rxvt_term::incr_cb)
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 195
197 termlist.push_back (this); 196 termlist.push_back (this);
198 197
199#ifdef KEYSYM_RESOURCE 198#ifdef KEYSYM_RESOURCE
201#endif 200#endif
202} 201}
203 202
204// 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.
205// for use before an emergency exit 204// for use before an emergency exit
205void
206void rxvt_term::emergency_cleanup () 206rxvt_term::emergency_cleanup ()
207{ 207{
208 if (cmd_pid) 208 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
210 210
211 pty_ev.stop (); 211 pty_ev.stop ();
223 if (fontset[i] != fontset[0]) 223 if (fontset[i] != fontset[0])
224 delete fontset[i]; 224 delete fontset[i];
225#endif 225#endif
226 delete fontset[0]; 226 delete fontset[0];
227 227
228#if HAVE_IMG
229 delete bg_img;
230#endif
231
228 if (display) 232 if (display)
229 { 233 {
230 selection_clear (); 234 selection_clear ();
235 selection_clear (true);
231 236
232#ifdef USE_XIM 237#if USE_XIM
233 im_destroy (); 238 im_destroy ();
234#endif 239#endif
235#ifdef XTERM_SCROLLBAR 240 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 241
237 if (ShadowGC) XFreeGC (dpy, ShadowGC); 242 if (gc)
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 243 XFreeGC (dpy, gc);
260 244
261 delete drawable; 245 delete drawable;
246
262 // destroy all windows 247 // destroy all windows
263 if (parent[0]) 248 if (parent)
264 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
265 250
266 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
268 { 253 {
269 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
270#if OFF_FOCUS_FADING 255#if OFF_FOCUS_FADING
256 if (rs[Rs_fade])
271 pix_colors_unfocused [i].free (this); 257 pix_colors_unfocused [i].free (this);
272#endif 258#endif
273 } 259 }
274 260
275 clear (); 261 clear ();
276 }
277 262
278 delete [] pix_colors_focused; 263 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 264 displays.put (display);
265 }
284 266
285 scr_release (); 267 scr_release ();
286 268
287 /* clear all resources */ 269 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 271 free (allocated [i]);
290 272
291 free (selection.text); 273 free (selection.text);
292 // TODO: manage env vars in child only(!) 274 free (selection.clip_text);
293 free (env_display);
294 free (env_term);
295 free (locale); 275 free (locale);
296 free (v_buffer); 276 free (v_buffer);
297 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;
298 284
299 delete envv; 285 delete envv;
300 delete argv; 286 delete argv;
301 287
302#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
303 delete keyboard; 289 delete keyboard;
304#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
294
295 SET_R ((rxvt_term *)0);
305} 296}
306 297
307// child has exited, usually destroys 298// child has exited, usually destroys
308void 299void
309rxvt_term::child_cb (child_watcher &w, int status) 300rxvt_term::child_cb (ev::child &w, int status)
310{ 301{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 303
313 cmd_pid = 0; 304 cmd_pid = 0;
314 305
317} 308}
318 309
319void 310void
320rxvt_term::destroy () 311rxvt_term::destroy ()
321{ 312{
322 if (destroy_ev.active) 313 if (destroy_ev.is_active ())
323 return; 314 return;
324 315
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 317
327#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
331 if (display) 322 if (display)
332 { 323 {
333#if USE_XIM 324#if USE_XIM
334 im_ev.stop (display); 325 im_ev.stop (display);
335#endif 326#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
338#endif 328#if ENABLE_PERL
339#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
341#endif 330#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 331 termwin_ev.stop (display);
344 vt_ev.stop (display); 332 vt_ev.stop (display);
345 } 333 }
346 334
347 check_ev.stop (); 335 flush_ev.stop ();
348 pty_ev.stop (); 336 pty_ev.stop ();
349#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
351#endif 339#endif
352#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
360#endif 348#endif
361#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
362 pointer_ev.stop (); 350 pointer_ev.stop ();
363#endif 351#endif
364 352
365 destroy_ev.start (0); 353 destroy_ev.start ();
366} 354}
367 355
368void 356void
369rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 358{
371 make_current (); 359 make_current ();
372 360
373 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);
374} 374}
375 375
376/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
377/* 377/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 379 */
381static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
382 381
383static void 382static void
384rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
386 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++)
387 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
388} 387}
389 388
390#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
391static void 390static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
393{ 392{
394 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
396 char number[32]; 395 char number[32];
397 char *mtype = "XlibMessage"; 396
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 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);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 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 {
404 sprintf(number, "%d", event->request_code); 460 sprintf (number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 462 rxvt_warn ("+ (which is %s)\n", buffer);
407 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 463 }
464
412 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 468 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 470 || event->error_code == BadColor
418 (event->error_code == BadGC) || 471 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 473 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
422 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ); 480 else
428 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 482
439int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 490{
442 if (GET_R->allowedxerror == -1) 491 if (GET_R && GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
444 else 493 else
445 { 494 {
446 // 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,
447 // so just output the error and continue 496 // so just output the error and continue
453 } 502 }
454 503
455 return 0; 504 return 0;
456} 505}
457 506
458int 507int ecb_cold
459rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
460{ 509{
461 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",
462 DisplayString (display)); 511 DisplayString (display));
463 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 513 _exit (EXIT_FAILURE);
465} 514}
466 515
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!option (Opt_transparent))
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
556
557 set_colorfgbg ();
558
559 init_command (cmd_argv);
560
561 free (cmd_argv);
562
563 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ);
565
566 check_ev.start ();
567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
583 return true;
584}
585
586static struct sig_handlers 516static struct sig_handlers
587{ 517{
588 sig_watcher sw_term, sw_int; 518 ev::sig sw_term, sw_int;
589 519
590 /* 520 /*
591 * Catch a fatal signal and tidy up before quitting 521 * Catch a fatal signal and tidy up before quitting
592 */ 522 */
593 void 523 void sig_term (ev::sig &w, int revents);
594 sig_term (sig_watcher &w) 524
525 sig_handlers ()
595 { 526 {
596 rxvt_emergency_cleanup (); 527 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597 signal (w.signum, SIG_DFL);
598 kill (getpid (), w.signum);
599 }
600
601 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term),
603 sw_int (this, &sig_handlers::sig_term) 528 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604 {
605 } 529 }
606} sig_handlers; 530} sig_handlers;
607 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
608char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
609 608
610void 609void
611rxvt_init () 610rxvt_init ()
612{ 611{
613 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");
614 623
615 rxvt_environ = environ; 624 rxvt_environ = environ;
616 625
617 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
619 628
620 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
622
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */
625 631
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
628 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
629 635
630 XrmInitialize (); 636 XrmInitialize ();
631}
632 637
633/* ------------------------------------------------------------------------- * 638#if HAVE_PIXBUF
634 * MEMORY ALLOCATION WRAPPERS * 639 g_type_init ();
635 * ------------------------------------------------------------------------- */ 640#endif
636void *
637rxvt_malloc (size_t size)
638{
639 void *p = malloc (size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647void *
648rxvt_calloc (size_t number, size_t size)
649{
650 void *p = calloc (number, size);
651
652 if (!p)
653 rxvt_fatal ("memory allocation failure. aborting.\n");
654
655 return p;
656}
657
658void *
659rxvt_realloc (void *ptr, size_t size)
660{
661 void *p = realloc (ptr, size);
662
663 if (!p)
664 rxvt_fatal ("memory allocation failure. aborting.\n");
665
666 return p;
667} 641}
668 642
669/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
670/* 644/*
671 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
673 */ 647 */
674void 648void
675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
676{ 650{
677 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
678 int x, y, sb_w, flags; 652 int x, y, flags;
679 unsigned int w, h; 653 unsigned int w, h;
680 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
681 655
682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
683 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
693 if (rs[Rs_geometry]) 667 if (rs[Rs_geometry])
694 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
695 669
696 if (flags & WidthValue) 670 if (flags & WidthValue)
697 { 671 {
672 if (!w)
673 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
674
698 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 675 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
699 szHint.flags |= USSize; 676 szHint.flags |= USSize;
700 } 677 }
701 678
702 if (flags & HeightValue) 679 if (flags & HeightValue)
703 { 680 {
681 if (!h)
682 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
683
704 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 684 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 685 szHint.flags |= USSize;
706 } 686 }
707 687
708 if (flags & XValue) 688 if (flags & XValue)
709 { 689 {
740 max_width = MAX_COLS * fwidth; 720 max_width = MAX_COLS * fwidth;
741 max_height = MAX_ROWS * fheight; 721 max_height = MAX_ROWS * fheight;
742 722
743 szHint.base_width = szHint.base_height = 2 * int_bwidth; 723 szHint.base_width = szHint.base_height = 2 * int_bwidth;
744 724
745 sb_w = 0;
746 window_vt_x = window_vt_y = int_bwidth; 725 window_vt_x = window_vt_y = int_bwidth;
747 726
748 if (scrollBar.state) 727 if (scrollBar.state)
749 { 728 {
750 sb_w = scrollbar_TotalWidth (); 729 int sb_w = scrollBar.total_width ();
751 szHint.base_width += sb_w; 730 szHint.base_width += sb_w;
752 731
753 if (!option (Opt_scrollBar_right)) 732 if (!option (Opt_scrollBar_right))
754 window_vt_x += sb_w; 733 window_vt_x += sb_w;
755 } 734 }
779 { 758 {
780 min_it (height, max_height); 759 min_it (height, max_height);
781 szHint.height = szHint.base_height + height; 760 szHint.height = szHint.base_height + height;
782 } 761 }
783 762
784 if (scrollBar.state && option (Opt_scrollBar_right))
785 window_sb_x = szHint.width - sb_w;
786
787 if (recalc_x) 763 if (recalc_x)
788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789 765
790 if (recalc_y) 766 if (recalc_y)
791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
792 768
793 ncol = width / fwidth; 769 ncol = width / fwidth;
794 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
795} 780}
796 781
797/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
798/* 783/*
799 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
807 792
808 struct winsize ws; 793 struct winsize ws;
809 794
810 ws.ws_col = ncol; 795 ws.ws_col = ncol;
811 ws.ws_row = nrow; 796 ws.ws_row = nrow;
812 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
813 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
815 800
816#if 0 801#if 0
817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
818 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
819 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
820#endif 805#endif
821} 806}
822 807
823/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
824/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
825 *
826 * init = 1 - initialize
827 *
828 * fontname == FONT_UP - switch to bigger font
829 * fontname == FONT_DN - switch to smaller font
830 */
831bool 810bool
832rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
833{ 812{
834 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
835 rxvt_fontprop prop; 814 rxvt_fontprop prop;
849#endif 828#endif
850 829
851 delete fontset[0]; 830 delete fontset[0];
852 fontset[0] = fs; 831 fontset[0] = fs;
853 832
854 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
855 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
856 835
857 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
858 837
859 fwidth = prop.width; 838 fwidth = prop.width;
860 fheight = prop.height; 839 fheight = prop.height + lineSpace;
861 fbase = prop.ascent; 840 fbase = prop.ascent;
862 841
863 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
864 { 843 {
865#if ENABLE_STYLES 844#if ENABLE_STYLES
891#else 870#else
892 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
893#endif 872#endif
894 } 873 }
895 874
896 if (parent[0]) 875 if (parent)
897 { 876 {
898 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 878 scr_remap_chars ();
900 scr_touch (true); 879 scr_touch (true);
901 } 880 }
902 881
903 return true; 882 return true;
904} 883}
905 884
885void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 887{
908 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
909 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 891}
912 892
893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 907{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
917 910
918 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
920 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
921 914
922 free (s); 915 free (s);
923 free (ws); 916 free (ws);
927/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
928/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
929void 922void
930rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
931{ 924{
932 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
933#if ENABLE_EWMH 926#if ENABLE_EWMH
934 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
935#endif 928#endif
936} 929}
937 930
938void 931void
939rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
940{ 933{
941 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
942#if ENABLE_EWMH 935#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 937#endif
945} 938}
946 939
940void
941rxvt_term::set_window_color (int idx, const char *color)
942{
947#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
948void
949rxvt_term::set_window_color (int idx, const char *color)
950{
951 rxvt_color xcol;
952 int i;
953
954 if (color == NULL || *color == '\0') 944 if (color == NULL || *color == '\0')
955 return; 945 return;
956 946
957 color = strdup (color); 947 color = strdup (color);
958 allocated.push_back ((void *)color); 948 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color; 949 rs[Rs_color + idx] = color;
960 950
961 /* handle color aliases */ 951 /* handle color aliases */
962 if (isdigit (*color)) 952 if (isdigit (*color))
963 { 953 {
964 i = atoi (color); 954 int i = atoi (color);
965 955
966 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
957 {
967 { /* bright colors */ 958 /* bright colors */
968 i -= 8; 959 alias_color (idx, minBrightCOLOR + i - 8);
969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
970 goto done; 960 goto done;
971 } 961 }
972 962
973 if (i >= 0 && i <= 7) 963 if (i >= 0 && i <= 7)
964 {
974 { /* normal colors */ 965 /* normal colors */
975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 966 alias_color (idx, minCOLOR + i);
976 goto done; 967 goto done;
977 } 968 }
978 } 969 }
979 970
980 set_color (xcol, color); 971 pix_colors_focused[idx].free (this);
972 set_color (pix_colors_focused[idx], color);
981 973
982 /*
983 * FIXME: should free colors here, but no idea how to do it so instead,
984 * so just keep gobbling up the colormap
985 */
986
987 pix_colors_focused[idx] = xcol;
988
989 /* XSetWindowAttributes attr; */
990 /* Cursor cursor; */
991done: 974done:
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
993 976
994 update_fade_color (idx); 977 update_fade_color (idx);
995 recolour_cursor (); 978 recolor_cursor ();
996 scr_recolour (); 979 scr_recolor ();
980#endif /* XTERM_COLOR_CHANGE */
997} 981}
998 982
999#else
1000# define set_window_color (idx,color) ((void)0)
1001#endif /* XTERM_COLOR_CHANGE */
1002
1003void 983void
1004rxvt_term::recolour_cursor () 984rxvt_term::recolor_cursor ()
1005{ 985{
1006 XColor fg, bg; 986 XColor fg, bg;
1007 987
1008 (ISSET_PIXCOLOR (Color_pointer_fg) 988 (ISSET_PIXCOLOR (Color_pointer_fg)
1009 ? pix_colors_focused[Color_pointer_fg] 989 ? pix_colors_focused[Color_pointer_fg]
1018 998
1019/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
1020/* 1000/*
1021 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
1022 */ 1002 */
1023void 1003char *
1024rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
1025{ 1005{
1026 unsigned int i; 1006 unsigned int i;
1027 const char *xpmb = "\0"; 1007 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
1029 1011
1030 strcpy (fstr, "default");
1031 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 1014 {
1035 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
1036 break; 1016 break;
1037 } 1017 }
1038 1018
1039 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 1021 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
1043#ifdef XPM_BACKGROUND 1023#if HAVE_IMG
1044 xpmb = "default;"; 1024 xpmb = "default;";
1045#endif 1025#endif
1046 break; 1026 break;
1047 } 1027 }
1048 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
1050} 1032}
1051 1033
1052/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
1053 1035
1054bool 1036bool
1062} 1044}
1063 1045
1064void 1046void
1065rxvt_term::alias_color (int dst, int src) 1047rxvt_term::alias_color (int dst, int src)
1066{ 1048{
1049 pix_colors[dst].free (this);
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1050 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1068} 1051}
1052
1053#ifdef SMART_RESIZE
1054static unsigned int
1055get_parent_bw (Display *dpy, Window w)
1056{
1057 int idummy;
1058 unsigned int udummy;
1059 Window wdummy, parent;
1060 Window *children;
1061 unsigned int nchildren, border_width;
1062
1063 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1064 XFree (children);
1065 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1066 &udummy, &udummy, &border_width, &udummy);
1067
1068 return border_width;
1069}
1070#endif
1069 1071
1070/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
1071 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
1072 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
1073void 1075void
1077 int old_width = szHint.width; 1079 int old_width = szHint.width;
1078 int old_height = szHint.height; 1080 int old_height = szHint.height;
1079 1081
1080 window_calc (newwidth, newheight); 1082 window_calc (newwidth, newheight);
1081 1083
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1084 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085
1086 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1087 if (set_hint)
1088 {
1089 szHint.flags &= ~(PBaseSize | PResizeInc);
1083 XSetWMNormalHints (dpy, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent, &szHint);
1091 szHint.flags |= PBaseSize | PResizeInc;
1092 }
1084 1093
1085 if (!ignoreparent) 1094 if (!ignoreparent)
1086 { 1095 {
1087#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
1088 /* 1097 /*
1092 int x, y, x1, y1; 1101 int x, y, x1, y1;
1093 int dx, dy; 1102 int dx, dy;
1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1095 Window unused_cr; 1104 Window unused_cr;
1096 1105
1097 XTranslateCoordinates (dpy, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent, display->root,
1098 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1101 /* 1110 /*
1102 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
1103 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
1104 */ 1113 */
1105 if (x1 != x || y1 != y) 1114 if (x1 != x || y1 != y)
1106 { 1115 {
1107 x -= x1; 1116 unsigned int border_width = get_parent_bw (dpy, parent);
1108 y -= y1; 1117
1118 x -= x1 + border_width;
1119 y -= y1 + border_width;
1109 } 1120 }
1110 1121
1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1113 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
1121 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
1122 dy = 0; 1133 dy = 0;
1123 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
1124 dy /= 2; 1135 dy /= 2;
1125 1136
1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1127 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
1128#else 1139#else
1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1130#endif 1141#endif
1131 } 1142 }
1143
1144 if (set_hint)
1145 XSetWMNormalHints (dpy, parent, &szHint);
1132 1146
1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1134 1148
1135 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1136 { 1150 {
1137 if (scrollBar.state) 1151 if (scrollBar.state)
1138 { 1152 scrollBar.resize ();
1139 XMoveResizeWindow (dpy, scrollBar.win,
1140 window_sb_x, 0,
1141 scrollbar_TotalWidth (), szHint.height);
1142 resize_scrollbar ();
1143 }
1144 1153
1145 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
1146 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1147 width, height); 1156 vt_width, vt_height);
1148 1157
1149#ifdef HAVE_BG_PIXMAP 1158 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1154 scr_clear ();
1155 } 1159 }
1156 1160
1157 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1158 scr_reset (); 1162 scr_reset ();
1159 1163
1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1161 //scr_touch (false);
1162
1163#ifdef HAVE_BG_PIXMAP
1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1165// if (bgPixmap.pixmap)
1166// scr_touch (false);
1167#endif
1168
1169#ifdef USE_XIM 1164#if USE_XIM
1170 IMSetPosition (); 1165 im_set_position ();
1171#endif 1166#endif
1172} 1167}
1173 1168
1174/* 1169/*
1175 * Set the width/height of the vt window in characters. Units are pixels. 1170 * Set the width/height of the vt window in characters. Units are pixels.
1188 newwidth = wattr.width - szHint.base_width; 1183 newwidth = wattr.width - szHint.base_width;
1189 if (newheight == 0) 1184 if (newheight == 0)
1190 newheight = wattr.height - szHint.base_height; 1185 newheight = wattr.height - szHint.base_height;
1191 } 1186 }
1192 1187
1193 if (newwidth != width || newheight != height) 1188 if (newwidth != vt_width || newheight != vt_height)
1194 { 1189 {
1195 newwidth += szHint.base_width; 1190 newwidth += szHint.base_width;
1196 newheight += szHint.base_height; 1191 newheight += szHint.base_height;
1197 resize_all_windows (newwidth, newheight, 0); 1192 resize_all_windows (newwidth, newheight, 0);
1198 } 1193 }
1199} 1194}
1200 1195
1201/* -------------------------------------------------------------------- * 1196/* -------------------------------------------------------------------- *
1202 * - X INPUT METHOD ROUTINES - * 1197 * - X INPUT METHOD ROUTINES - *
1203 * -------------------------------------------------------------------- */ 1198 * -------------------------------------------------------------------- */
1204#ifdef USE_XIM 1199#if USE_XIM
1205 1200
1206void 1201void
1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1202rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1208{ 1203{
1209 fg = pix_colors [Color_fg]; 1204 fg = pix_colors [Color_fg];
1236 status_rect.height = fheight; 1231 status_rect.height = fheight;
1237} 1232}
1238 1233
1239/* Checking whether input method is running. */ 1234/* Checking whether input method is running. */
1240bool 1235bool
1241rxvt_term::IMisRunning () 1236rxvt_term::im_is_running ()
1242{ 1237{
1243 char *p;
1244 Atom atom; 1238 Atom atom;
1245 Window win; 1239 Window win;
1246 char server[IMBUFSIZ]; 1240 char server[IMBUFSIZ];
1247 1241
1248 /* get current locale modifier */ 1242 /* get current locale modifier */
1249 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1243 if (char *p = XSetLocaleModifiers (0))
1250 { 1244 {
1251 strcpy (server, "@server="); 1245 strcpy (server, "@server=");
1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1246 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1253 1247
1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1248 if (p = strchr (server + 1, '@')) /* first one only */
1255 *p = '\0'; 1249 *p = '\0';
1256 1250
1257 atom = XInternAtom (dpy, server, False); 1251 atom = XInternAtom (dpy, server, False);
1258 win = XGetSelectionOwner (dpy, atom); 1252 win = XGetSelectionOwner (dpy, atom);
1259 1253
1260 if (win != None) 1254 if (win != None)
1261 return True; 1255 return true;
1262 } 1256 }
1263 1257
1264 return False; 1258 return false;
1265} 1259}
1266 1260
1267void 1261void
1268rxvt_term::IMSendSpot () 1262rxvt_term::im_send_spot ()
1269{ 1263{
1270 XPoint nspot; 1264 XPoint nspot;
1271 XVaNestedList preedit_attr; 1265 XVaNestedList preedit_attr;
1272 1266
1273 if (!Input_Context 1267 if (!Input_Context
1326 1320
1327 term->make_current (); 1321 term->make_current ();
1328 1322
1329 if (text) 1323 if (text)
1330 { 1324 {
1331 void *str; 1325 wchar_t *str;
1332 1326
1333 if (!text->encoding_is_wchar && text->string.multi_byte) 1327 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 { 1328 {
1335 // of course, X makes it ugly again 1329 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale]) 1330 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]); 1331 SET_LOCALE (term->rs[Rs_imLocale]);
1338 1332
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1333 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1334 mbstowcs (str, text->string.multi_byte, text->length + 1);
1341 1335
1342 if (term->rs[Rs_imLocale]) 1336 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1337 SET_LOCALE (term->locale);
1344 } 1338 }
1345 else 1339 else
1346 str = (void *)text->string.wide_char; 1340 str = text->string.wide_char;
1347 1341
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1342 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1343 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1344 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1345 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1346 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1379/* 1373/*
1380 * Try to open a XIM with the current modifiers, then see if we can 1374 * Try to open a XIM with the current modifiers, then see if we can
1381 * open a suitable preedit type 1375 * open a suitable preedit type
1382 */ 1376 */
1383bool 1377bool
1384rxvt_term::IM_get_IC (const char *modifiers) 1378rxvt_term::im_get_ic (const char *modifiers)
1385{ 1379{
1386 int i, j, found; 1380 int i, j, found;
1387 XIM xim; 1381 XIM xim;
1388 XPoint spot; 1382 XPoint spot;
1389 XRectangle rect, status_rect, needed_rect; 1383 XRectangle rect, status_rect, needed_rect;
1390 unsigned long fg, bg; 1384 unsigned long fg, bg;
1391 const char *p; 1385 const char *p;
1392 char **s; 1386 char **s;
1393 XIMStyles *xim_styles; 1387 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1397 1388
1398 set_environ (envv); 1389 set_environ (env);
1399 1390
1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1391 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1401 return false; 1392 return false;
1402 1393
1403 input_method = display->get_xim (locale, modifiers); 1394 input_method = display->get_xim (locale, modifiers);
1404 if (input_method == NULL) 1395 if (input_method == NULL)
1405 return false; 1396 return false;
1422 p = pet[pi]; 1413 p = pet[pi];
1423 1414
1424 if (!p) 1415 if (!p)
1425 continue; 1416 continue;
1426 1417
1427 s = rxvt_splitcommastring (p); 1418 s = rxvt_strsplit (',', p);
1428 1419
1429 for (i = found = 0; !found && s[i]; i++) 1420 for (i = found = 0; !found && s[i]; i++)
1430 { 1421 {
1431 if (!strcmp (s[i], "OverTheSpot")) 1422 if (!strcmp (s[i], "OverTheSpot"))
1432 input_style = XIMPreeditPosition | XIMStatusNothing; 1423 input_style = XIMPreeditPosition | XIMStatusNothing;
1444 input_style = XIMPreeditNothing | XIMStatusNothing; 1435 input_style = XIMPreeditNothing | XIMStatusNothing;
1445 1436
1446 for (j = 0; j < xim_styles->count_styles; j++) 1437 for (j = 0; j < xim_styles->count_styles; j++)
1447 if (input_style == xim_styles->supported_styles[j]) 1438 if (input_style == xim_styles->supported_styles[j])
1448 { 1439 {
1449 rxvt_freecommastring (s); 1440 rxvt_free_strsplit (s);
1450 1441
1451 found = 1; 1442 found = 1;
1452 goto foundpet; 1443 goto foundpet;
1453 } 1444 }
1454 1445
1455 } 1446 }
1456 1447
1457 rxvt_freecommastring (s); 1448 rxvt_free_strsplit (s);
1458 } 1449 }
1459 1450
1460foundpet: 1451foundpet:
1461 1452
1462 XFree (xim_styles); 1453 XFree (xim_styles);
1541 NULL); 1532 NULL);
1542 } 1533 }
1543#if ENABLE_XIM_ONTHESPOT 1534#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks) 1535 else if (input_style & XIMPreeditCallbacks)
1545 { 1536 {
1537 XIMCallback xcb[4];
1538
1546 im_set_position (spot); 1539 im_set_position (spot);
1547 1540
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1541 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1542 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1543 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1565#endif 1558#endif
1566 1559
1567 Input_Context = XCreateIC (xim, 1560 Input_Context = XCreateIC (xim,
1568 XNInputStyle, input_style, 1561 XNInputStyle, input_style,
1569 XNClientWindow, vt, 1562 XNClientWindow, vt,
1570 XNFocusWindow, parent[0], 1563 XNFocusWindow, parent,
1571 preedit_attr ? XNPreeditAttributes : NULL, 1564 preedit_attr ? XNPreeditAttributes : NULL,
1572 preedit_attr, 1565 preedit_attr,
1573 status_attr ? XNStatusAttributes : NULL, 1566 status_attr ? XNStatusAttributes : NULL,
1574 status_attr, NULL); 1567 status_attr, NULL);
1575 1568
1588 // unfortunately, only the focus window is used by XIM, hard to fix 1581 // unfortunately, only the focus window is used by XIM, hard to fix
1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1582 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1590 vt_select_input (); 1583 vt_select_input ();
1591#endif 1584#endif
1592 1585
1593 IMSetPosition (); 1586 im_set_position ();
1594 1587
1595 return true; 1588 return true;
1596} 1589}
1597 1590
1598void 1591void
1608 im_destroy (); 1601 im_destroy ();
1609 1602
1610 if (Input_Context) 1603 if (Input_Context)
1611 return; 1604 return;
1612 1605
1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1614 if (rs[Rs_imLocale]) 1606 if (rs[Rs_imLocale])
1615 SET_LOCALE (rs[Rs_imLocale]); 1607 SET_LOCALE (rs[Rs_imLocale]);
1616#endif
1617 1608
1618 p = rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1619 if (p && *p) 1610 if (p && *p)
1620 { 1611 {
1621 bool found = false; 1612 bool found = false;
1622 1613
1623 s = rxvt_splitcommastring (p); 1614 s = rxvt_strsplit (',', p);
1624 1615
1625 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1626 { 1617 {
1627 if (*s[i]) 1618 if (*s[i])
1628 { 1619 {
1629 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
1630 strncat (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1631 if (IM_get_IC (buf)) 1622 if (im_get_ic (buf))
1632 { 1623 {
1633 found = true; 1624 found = true;
1634 break; 1625 break;
1635 } 1626 }
1636 } 1627 }
1637 } 1628 }
1638 1629
1639 rxvt_freecommastring (s); 1630 rxvt_free_strsplit (s);
1640 1631
1641 if (found) 1632 if (found)
1642 goto done; 1633 goto done;
1643 } 1634 }
1644 1635
1645 /* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1646 if (IM_get_IC ("")) 1637 if (im_get_ic (""))
1647 goto done; 1638 goto done;
1648 1639
1649 /* try with no modifiers base IF the user didn't specify an IM */ 1640 /* try with no modifiers base IF the user didn't specify an IM */
1650 if (IM_get_IC ("@im=none")) 1641 if (im_get_ic ("@im=none"))
1651 goto done; 1642 goto done;
1652 1643
1653done: 1644done:
1654#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1655 if (rs[Rs_imLocale]) 1645 if (rs[Rs_imLocale])
1656 SET_LOCALE (locale); 1646 SET_LOCALE (locale);
1657#endif
1658} 1647}
1659 1648
1660void 1649void
1661rxvt_term::IMSetPosition () 1650rxvt_term::im_set_position ()
1662{ 1651{
1663 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1664 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1665 1654
1666 if (!Input_Context 1655 if (!Input_Context
1667 || !focus 1656 || !focus
1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1657 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1669 || !IMisRunning ()) 1658 || !im_is_running ())
1670 return; 1659 return;
1671 1660
1672 if (input_style & XIMPreeditPosition) 1661 if (input_style & XIMPreeditPosition)
1673 { 1662 {
1674 im_set_size (preedit_rect); 1663 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1664 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1665
1677 XSetICValues (Input_Context, 1666 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1667 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1668 }
1680 else 1669 else
1681 { 1670 {
1698 XFree (status_attr); 1687 XFree (status_attr);
1699 } 1688 }
1700 1689
1701 XFree (preedit_attr); 1690 XFree (preedit_attr);
1702} 1691}
1703#endif /* USE_XIM */ 1692#endif /* USE_XIM */
1693
1694void
1695rxvt_term::get_window_origin (int &x, int &y)
1696{
1697 Window cr;
1698 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1699}
1704 1700
1705/*----------------------- end-of-file (C source) -----------------------*/ 1701/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines