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.241 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

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

Diff Legend

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