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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines