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.141 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.404 by root, Thu Jun 17 14:31:39 2021 UTC

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

Diff Legend

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