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.138 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.403 by root, Thu Jun 17 00:49:20 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_FRILLS 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 g_type_init ();
567{
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
594/* INTPROTO */
595void *
596rxvt_calloc (size_t number, size_t size)
597{
598 void *p = calloc (number, size);
599
600 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n");
602
603 return p;
604}
605
606/* INTPROTO */
607void *
608rxvt_realloc (void *ptr, size_t size)
609{
610 void *p = realloc (ptr, size);
611
612 if (!p)
613 rxvt_fatal ("memory allocation failure. aborting.\n");
614
615 return p;
616}
617
618/* ------------------------------------------------------------------------- *
619 * PRIVILEGED OPERATIONS *
620 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */
622void
623rxvt_privileges (rxvt_privaction action)
624{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a))
635# define HAVE_SETEUID
636# endif 640#endif
637# ifdef HAVE_SETEUID
638 switch (action)
639 {
640 case IGNORE:
641 /*
642 * change effective uid/gid - not real uid/gid - so we can switch
643 * back to root later, as required
644 */
645 seteuid (getuid ());
646 setegid (getgid ());
647 break;
648 case SAVE:
649 euid = geteuid ();
650 egid = getegid ();
651 break;
652 case RESTORE:
653 seteuid (euid);
654 setegid (egid);
655 break;
656 }
657# else
658 switch (action)
659 {
660 case IGNORE:
661 setuid (getuid ());
662 setgid (getgid ());
663 /* FALLTHROUGH */
664 case SAVE:
665 /* FALLTHROUGH */
666 case RESTORE:
667 break;
668 }
669# endif
670#endif
671} 641}
672
673#ifdef UTMP_SUPPORT
674void
675rxvt_term::privileged_utmp (rxvt_privaction action)
676{
677 if ((options & Opt_utmpInhibit)
678 || !pty.name || !*pty.name)
679 return;
680
681 rxvt_privileges (RESTORE);
682
683 if (action == SAVE)
684 makeutent (pty.name, rs[Rs_display_name]);
685 else
686 cleanutent ();
687
688 rxvt_privileges (IGNORE);
689}
690#endif
691 642
692/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
693/* 644/*
694 * window size/position calculcations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
696 */ 647 */
697void 648void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 650{
700 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 652 int x, y, flags;
702 unsigned int w, h; 653 unsigned int w, h;
703 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
704 dDisp;
705 655
706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
707 TermWin.ncol, TermWin.nrow, szHint.width,
708 szHint.height));
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 658 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 659
713 recalc_x = recalc_y = 0; 660 recalc_x = recalc_y = 0;
714 flags = 0; 661 flags = 0;
662
715 if (!parsed_geometry) 663 if (!parsed_geometry)
716 { 664 {
717 parsed_geometry = 1; 665 parsed_geometry = 1;
666
718 if (rs[Rs_geometry]) 667 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 669
721 if (flags & WidthValue) 670 if (flags & WidthValue)
722 { 671 {
723 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 672 if (!w)
673 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
674
675 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 676 szHint.flags |= USSize;
725 } 677 }
726 678
727 if (flags & HeightValue) 679 if (flags & HeightValue)
728 { 680 {
729 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 681 if (!h)
682 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
683
684 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 685 szHint.flags |= USSize;
731 } 686 }
732 687
733 if (flags & XValue) 688 if (flags & XValue)
734 { 689 {
735 szHint.x = x; 690 szHint.x = x;
736 szHint.flags |= USPosition; 691 szHint.flags |= USPosition;
692
737 if (flags & XNegative) 693 if (flags & XNegative)
738 { 694 {
739 recalc_x = 1; 695 recalc_x = 1;
740 szHint.win_gravity = NorthEastGravity; 696 szHint.win_gravity = NorthEastGravity;
741 } 697 }
… …
743 699
744 if (flags & YValue) 700 if (flags & YValue)
745 { 701 {
746 szHint.y = y; 702 szHint.y = y;
747 szHint.flags |= USPosition; 703 szHint.flags |= USPosition;
704
748 if (flags & YNegative) 705 if (flags & YNegative)
749 { 706 {
750 recalc_y = 1; 707 recalc_y = 1;
708
751 if (szHint.win_gravity == NorthEastGravity) 709 if (szHint.win_gravity == NorthEastGravity)
752 szHint.win_gravity = SouthEastGravity; 710 szHint.win_gravity = SouthEastGravity;
753 else 711 else
754 szHint.win_gravity = SouthWestGravity; 712 szHint.win_gravity = SouthWestGravity;
755 } 713 }
756 } 714 }
757 } 715 }
758 716
759 /* TODO: BOUNDS */ 717 /* TODO: BOUNDS */
760 TermWin.width = TermWin.ncol * TermWin.fwidth; 718 width = ncol * fwidth;
761 TermWin.height = TermWin.nrow * TermWin.fheight; 719 height = nrow * fheight;
762 max_width = MAX_COLS * TermWin.fwidth; 720 max_width = MAX_COLS * fwidth;
763 max_height = MAX_ROWS * TermWin.fheight; 721 max_height = MAX_ROWS * fheight;
764 722
765 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 723 szHint.base_width = szHint.base_height = 2 * int_bwidth;
766 724
767 sb_w = mb_h = 0;
768 window_vt_x = window_vt_y = TermWin.int_bwidth; 725 window_vt_x = window_vt_y = int_bwidth;
769 726
770 if (scrollbar_visible ()) 727 if (scrollBar.state)
771 { 728 {
772 sb_w = scrollbar_TotalWidth (); 729 int sb_w = scrollBar.total_width ();
773 szHint.base_width += sb_w; 730 szHint.base_width += sb_w;
731
774 if (!(options & Opt_scrollBar_right)) 732 if (!option (Opt_scrollBar_right))
775 window_vt_x += sb_w; 733 window_vt_x += sb_w;
776 } 734 }
777 735
778 if (menubar_visible ())
779 {
780 mb_h = menuBar_TotalHeight ();
781 szHint.base_height += mb_h;
782 window_vt_y += mb_h;
783 }
784
785 szHint.width_inc = TermWin.fwidth; 736 szHint.width_inc = fwidth;
786 szHint.height_inc = TermWin.fheight; 737 szHint.height_inc = fheight;
787 szHint.min_width = szHint.base_width + szHint.width_inc; 738 szHint.min_width = szHint.base_width + szHint.width_inc;
788 szHint.min_height = szHint.base_height + szHint.height_inc; 739 szHint.min_height = szHint.base_height + szHint.height_inc;
789 740
790 if (width && width - szHint.base_width < max_width) 741 if (newwidth && newwidth - szHint.base_width < max_width)
791 { 742 {
792 szHint.width = width; 743 szHint.width = newwidth;
793 TermWin.width = width - szHint.base_width; 744 width = newwidth - szHint.base_width;
794 } 745 }
795 else 746 else
796 { 747 {
797 MIN_IT (TermWin.width, max_width); 748 min_it (width, max_width);
798 szHint.width = szHint.base_width + TermWin.width; 749 szHint.width = szHint.base_width + width;
799 } 750 }
800 751
801 if (height && height - szHint.base_height < max_height) 752 if (newheight && newheight - szHint.base_height < max_height)
802 { 753 {
803 szHint.height = height; 754 szHint.height = newheight;
804 TermWin.height = height - szHint.base_height; 755 height = newheight - szHint.base_height;
805 } 756 }
806 else 757 else
807 { 758 {
808 MIN_IT (TermWin.height, max_height); 759 min_it (height, max_height);
809 szHint.height = szHint.base_height + TermWin.height; 760 szHint.height = szHint.base_height + height;
810 } 761 }
811
812 if (scrollbar_visible () && (options & Opt_scrollBar_right))
813 window_sb_x = szHint.width - sb_w;
814 762
815 if (recalc_x) 763 if (recalc_x)
816 szHint.x += (DisplayWidth (disp, display->screen) 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
817 - szHint.width - 2 * TermWin.ext_bwidth); 765
818 if (recalc_y) 766 if (recalc_y)
819 szHint.y += (DisplayHeight (disp, display->screen) 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
820 - szHint.height - 2 * TermWin.ext_bwidth);
821 768
822 TermWin.ncol = TermWin.width / TermWin.fwidth; 769 ncol = width / fwidth;
823 TermWin.nrow = TermWin.height / TermWin.fheight; 770 nrow = height / fheight;
824 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 771
825 TermWin.ncol, TermWin.nrow, szHint.width, 772 // When the size of the vt window is not a multiple of the cell
826 szHint.height)); 773 // size, i.e., when the wm does not honour our size hints, there are
827 return; 774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
828} 780}
829 781
830/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
831/* 783/*
832 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
833 * Called after a window size change. 785 * Called after a window size change.
834 */ 786 */
835void 787void
836rxvt_term::tt_winch () 788rxvt_term::tt_winch ()
837{ 789{
838 if (pty.pty < 0) 790 if (pty->pty < 0)
839 return; 791 return;
840 792
841 struct winsize ws; 793 struct winsize ws;
842 794
843 ws.ws_col = TermWin.ncol; 795 ws.ws_col = ncol;
844 ws.ws_row = TermWin.nrow; 796 ws.ws_row = nrow;
845 ws.ws_xpixel = TermWin.width; 797 ws.ws_xpixel = vt_width;
846 ws.ws_ypixel = TermWin.height; 798 ws.ws_ypixel = vt_height;
847 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
848 800
849#if 0 801#if 0
850 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
851 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
852 kill (cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
853#endif 805#endif
854} 806}
855 807
856/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
857/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
858/*
859 * init = 1 - initialize
860 *
861 * fontname == FONT_UP - switch to bigger font
862 * fontname == FONT_DN - switch to smaller font
863 */
864bool 810bool
865rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
866{ 812{
867 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
868 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
875 return false; 821 return false;
876 } 822 }
877 823
878#if ENABLE_STYLES 824#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; ) 825 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0]) 826 if (fontset[i] != fontset[0])
881 delete TermWin.fontset[i]; 827 delete fontset[i];
882#endif 828#endif
883 829
884 delete TermWin.fontset[0]; 830 delete fontset[0];
885 TermWin.fontset[0] = fs; 831 fontset[0] = fs;
886 832
887 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
888 prop.height += TermWin.lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
835
889 fs->set_prop (prop); 836 fs->set_prop (prop, false);
890 837
891 TermWin.fwidth = prop.width; 838 fwidth = prop.width;
892 TermWin.fheight = prop.height; 839 fheight = prop.height + lineSpace;
893 TermWin.fweight = prop.weight; 840 fbase = prop.ascent;
894 TermWin.fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent;
896 841
897 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
898 { 843 {
899#if ENABLE_STYLES 844#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style]; 845 const char *res = rs[Rs_font + style];
901 846
902 if (res && !*res) 847 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0]; 848 fontset[style] = fontset[0];
904 else 849 else
905 { 850 {
906 TermWin.fontset[style] = fs = new rxvt_fontset (this); 851 fontset[style] = fs = new rxvt_fontset (this);
907 rxvt_fontprop prop2 = prop; 852 rxvt_fontprop prop2 = prop;
908 853
909 if (res) 854 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset; 855 {
856 fs->populate (res);
857 fs->set_prop (prop2, false);
858 }
911 else 859 else
912 { 860 {
913 res = TermWin.fontset[0]->fontdesc; 861 fs->populate (fontset[0]->fontdesc);
914 862
915 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 863 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
916 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 864 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
865
866 fs->set_prop (prop2, true);
917 } 867 }
918 868
919 fs->populate (res);
920 fs->set_prop (prop2);
921 } 869 }
922#else 870#else
923 TermWin.fontset[style] = TermWin.fontset[0]; 871 fontset[style] = fontset[0];
924#endif 872#endif
925 } 873 }
926 874
927 if (TermWin.parent[0]) 875 if (parent)
928 { 876 {
929 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
930 scr_remap_chars (); 878 scr_remap_chars ();
931 scr_touch (true); 879 scr_touch (true);
932 } 880 }
933 881
934 return true; 882 return true;
935} 883}
936 884
885void
937void rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
938{ 887{
939 // TODO: SMART_WINDOW_TITLE 888 XChangeProperty (dpy, parent,
940 XChangeProperty (display->display, TermWin.parent[0],
941 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943} 891}
944 892
893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
945void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
946{ 907{
947 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
950 910
951 XChangeProperty (display->display, TermWin.parent[0], 911 XChangeProperty (dpy, parent,
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
954 914
955 free (s); 915 free (s);
956 free (ws); 916 free (ws);
… …
960/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
961/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
962void 922void
963rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
964{ 924{
965 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
966#if ENABLE_FRILLS 926#if ENABLE_EWMH
967 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
968#endif 928#endif
969} 929}
970 930
971void 931void
972rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
973{ 933{
974 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
975#if ENABLE_FRILLS 935#if ENABLE_EWMH
976 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977#endif 937#endif
978} 938}
979 939
940void
941rxvt_term::set_window_color (int idx, const char *color)
942{
980#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
981void
982rxvt_term::set_window_color (int idx, const char *color)
983{
984 rxvt_color xcol;
985 int i;
986
987 if (color == NULL || *color == '\0') 944 if (color == NULL || *color == '\0')
988 return; 945 return;
989 946
947 color = strdup (color);
948 allocated.push_back ((void *)color);
949 rs[Rs_color + idx] = color;
950
990 /* handle color aliases */ 951 /* handle color aliases */
991 if (isdigit (*color)) 952 if (isdigit (*color))
992 { 953 {
993 i = atoi (color); 954 int i = atoi (color);
994 955
995 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
957 {
996 { /* bright colors */ 958 /* bright colors */
997 i -= 8; 959 alias_color (idx, minBrightCOLOR + i - 8);
998# ifndef NO_BRIGHTCOLOR
999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000 SET_PIXCOLOR (idx);
1001 goto Done; 960 goto done;
1002# endif
1003 } 961 }
1004 962
1005 if (i >= 0 && i <= 7) 963 if (i >= 0 && i <= 7)
964 {
1006 { /* normal colors */ 965 /* normal colors */
1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 966 alias_color (idx, minCOLOR + i);
1008 SET_PIXCOLOR (idx);
1009 goto Done; 967 goto done;
1010 } 968 }
1011 } 969 }
1012 970
1013 if (!rXParseAllocColor (&xcol, color)) 971 pix_colors_focused[idx].free (this);
1014 return; 972 set_color (pix_colors_focused[idx], color);
1015 973
1016 /* XStoreColor (display->display, display->cmap, XColor*); */
1017
1018 /*
1019 * FIXME: should free colors here, but no idea how to do it so instead,
1020 * so just keep gobbling up the colormap
1021 */
1022# if 0
1023 for (i = Color_Black; i <= Color_White; i++)
1024 if (pix_colors[idx] == pix_colors[i])
1025 break;
1026 if (i > Color_White)
1027 {
1028 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1029 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1030 DisplayPlanes (display->display, display->screen));
1031 }
1032# endif
1033
1034 pix_colors_focused[idx] = xcol;
1035 SET_PIXCOLOR (idx);
1036
1037 /* XSetWindowAttributes attr; */
1038 /* Cursor cursor; */
1039Done: 974done:
1040#ifdef OFF_FOCUS_FADING
1041 if (rs[Rs_fade])
1042 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1043#endif
1044
1045 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
1046 976
977 update_fade_color (idx);
1047 recolour_cursor (); 978 recolor_cursor ();
1048 scr_recolour (); 979 scr_recolor ();
980#endif /* XTERM_COLOR_CHANGE */
1049} 981}
1050 982
1051#else
1052# define set_window_color (idx,color) ((void)0)
1053#endif /* XTERM_COLOR_CHANGE */
1054
1055void 983void
1056rxvt_term::recolour_cursor () 984rxvt_term::recolor_cursor ()
1057{ 985{
1058 XColor xcol[2]; 986 XColor fg, bg;
1059 987
1060 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 988 (ISSET_PIXCOLOR (Color_pointer_fg)
1061 ? pix_colors_focused[Color_pointer_fg] 989 ? pix_colors_focused[Color_pointer_fg]
1062 : pix_colors_focused[Color_fg]; 990 : pix_colors_focused[Color_fg]).get (fg);
991
1063 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 992 (ISSET_PIXCOLOR (Color_pointer_bg)
1064 ? pix_colors_focused[Color_pointer_bg] 993 ? pix_colors_focused[Color_pointer_bg]
1065 : pix_colors_focused[Color_bg]; 994 : pix_colors_focused[Color_bg]).get (bg);
1066 995
1067 XQueryColors (display->display, display->cmap, xcol, 2); 996 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1068 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1069} 997}
1070 998
1071/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
1072/* 1000/*
1073 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
1074 */ 1002 */
1075void 1003char *
1076rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
1077{ 1005{
1078 unsigned int i; 1006 unsigned int i;
1079 const char *xpmb = "\0"; 1007 const char *xpmb = "";
1080 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
1081 1011
1082 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1083 strcpy (fstr, "default");
1084 strcpy (bstr, "default");
1085 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
1086 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
1087 { 1014 {
1088 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
1089 break; 1016 break;
1090 } 1017 }
1091 1018
1092 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
1093 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
1094 { 1021 {
1095 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
1096#ifdef XPM_BACKGROUND 1023#if HAVE_IMG
1097 xpmb = "default;"; 1024 xpmb = "default;";
1098#endif 1025#endif
1099 break; 1026 break;
1100 } 1027 }
1101 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1102 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
1103} 1032}
1104 1033
1105/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
1106 1035
1107int 1036bool
1108rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1037rxvt_term::set_color (rxvt_color &color, const char *name)
1109{ 1038{
1110 if (!screen_in_out->set (display, colour)) 1039 if (color.set (this, name))
1111 {
1112 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1113 return false;
1114 }
1115
1116 return true; 1040 return true;
1041
1042 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1043 return false;
1117} 1044}
1045
1046void
1047rxvt_term::alias_color (int dst, int src)
1048{
1049 pix_colors[dst].free (this);
1050 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1051}
1052
1053#ifdef SMART_RESIZE
1054static unsigned int
1055get_parent_bw (Display *dpy, Window w)
1056{
1057 int idummy;
1058 unsigned int udummy;
1059 Window wdummy, parent;
1060 Window *children;
1061 unsigned int nchildren, border_width;
1062
1063 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1064 XFree (children);
1065 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1066 &udummy, &udummy, &border_width, &udummy);
1067
1068 return border_width;
1069}
1070#endif
1118 1071
1119/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
1120 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
1121 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
1122void 1075void
1123rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1076rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1124{ 1077{
1125 int fix_screen; 1078 int fix_screen;
1126#ifdef SMART_RESIZE 1079 int old_width = szHint.width;
1127 int old_width = szHint.width, old_height = szHint.height; 1080 int old_height = szHint.height;
1128#endif
1129 dDisp;
1130 1081
1131 window_calc (width, height); 1082 window_calc (newwidth, newheight);
1083
1084 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085
1086 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1087 if (set_hint)
1088 {
1089 szHint.flags &= ~(PBaseSize | PResizeInc);
1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent, &szHint);
1091 szHint.flags |= PBaseSize | PResizeInc;
1092 }
1133 1093
1134 if (!ignoreparent) 1094 if (!ignoreparent)
1135 { 1095 {
1136#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
1137 /* 1097 /*
… …
1141 int x, y, x1, y1; 1101 int x, y, x1, y1;
1142 int dx, dy; 1102 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1104 Window unused_cr;
1145 1105
1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent, display->root,
1147 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1110 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
1153 */ 1113 */
1154 if (x1 != x || y1 != y) 1114 if (x1 != x || y1 != y)
1155 { 1115 {
1156 x -= x1; 1116 unsigned int border_width = get_parent_bw (dpy, parent);
1157 y -= y1; 1117
1118 x -= x1 + border_width;
1119 y -= y1 + border_width;
1158 } 1120 }
1159 1121
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1125 dy = old_height - szHint.height;
1164 1126
1165 /* Check position of the center of the window */ 1127 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1128 if (x < x1) /* left half */
1167 dx = 0; 1129 dx = 0;
… …
1170 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
1171 dy = 0; 1133 dy = 0;
1172 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
1173 dy /= 2; 1135 dy /= 2;
1174 1136
1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1176 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
1177#else 1139#else
1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1179#endif 1141#endif
1180 } 1142 }
1181 1143
1144 if (set_hint)
1145 XSetWMNormalHints (dpy, parent, &szHint);
1146
1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1148
1184 if (fix_screen || width != old_width || height != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1150 {
1186 if (scrollbar_visible ()) 1151 if (scrollBar.state)
1187 { 1152 scrollBar.resize ();
1188 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar ();
1192 }
1193 1153
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, TermWin.vt, 1154 XMoveResizeWindow (dpy, vt,
1200 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1156 vt_width, vt_height);
1202 1157
1203 scr_clear (); 1158 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1204#ifdef XPM_BACKGROUND
1205 resize_pixmap ();
1206#endif
1207 } 1159 }
1208 1160
1209 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1210 {
1211 int curr_screen = -1;
1212 int old_ncol = prev_ncol;
1213
1214 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */
1216 {
1217 unsigned int ncol = TermWin.ncol;
1218 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY);
1220 TermWin.ncol = ncol;
1221 }
1222
1223 scr_reset (); 1162 scr_reset ();
1224 1163
1225 if (curr_screen >= 0) /* this is not the first time through */
1226 {
1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1229 }
1230 }
1231
1232 old_width = szHint.width;
1233 old_height = szHint.height;
1234
1235#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap)
1237 scr_touch (false);
1238#endif
1239
1240#ifdef USE_XIM 1164#if USE_XIM
1241 IMSetStatusPosition (); 1165 im_set_position ();
1242#endif 1166#endif
1243} 1167}
1244 1168
1245/* 1169/*
1246 * Set the width/height of the vt window in characters. Units are pixels. 1170 * Set the width/height of the vt window in characters. Units are pixels.
1247 * good for toggling 80/132 columns 1171 * good for toggling 80/132 columns
1248 */ 1172 */
1249void 1173void
1250rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1174rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251{ 1175{
1252 XWindowAttributes wattr; 1176 XWindowAttributes wattr;
1253 1177
1254 if (width == 0 || height == 0) 1178 if (newwidth == 0 || newheight == 0)
1255 { 1179 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1180 XGetWindowAttributes (dpy, display->root, &wattr);
1181
1257 if (width == 0) 1182 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1183 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1184 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1185 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1186 }
1187
1188 if (newwidth != vt_width || newheight != vt_height)
1189 {
1265 width += szHint.base_width; 1190 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1191 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1192 resize_all_windows (newwidth, newheight, 0);
1268 } 1193 }
1269} 1194}
1270 1195
1271/* -------------------------------------------------------------------- * 1196/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1197 * - X INPUT METHOD ROUTINES - *
1273 * -------------------------------------------------------------------- */ 1198 * -------------------------------------------------------------------- */
1274#ifdef USE_XIM 1199#if USE_XIM
1275 1200
1276void 1201void
1277rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1202rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1278{ 1203{
1279 fg = pix_colors[Color_fg]; 1204 fg = pix_colors [Color_fg];
1280 bg = pix_colors[Color_bg]; 1205 bg = pix_colors [Color_bg];
1281} 1206}
1282 1207
1283void 1208void
1284rxvt_term::im_set_size (XRectangle &size) 1209rxvt_term::im_set_size (XRectangle &size)
1285{ 1210{
1286 // the int_bwidth terms make no sense to me 1211 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1212 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1213 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1214 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1215 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1216}
1292 1217
1293void 1218void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1219rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1220 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1221 const XRectangle &needed_rect)
1297{ 1222{
1298 preedit_rect.x = needed_rect.width; 1223 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1224 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1225 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1226 preedit_rect.height = fheight;
1302 1227
1303 status_rect.x = 0; 1228 status_rect.x = 0;
1304 status_rect.y = 0; 1229 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1230 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1231 status_rect.height = fheight;
1307} 1232}
1308 1233
1309/* Checking whether input method is running. */ 1234/* Checking whether input method is running. */
1310bool 1235bool
1311rxvt_term::IMisRunning () 1236rxvt_term::im_is_running ()
1312{ 1237{
1313 char *p;
1314 Atom atom; 1238 Atom atom;
1315 Window win; 1239 Window win;
1316 char server[IMBUFSIZ]; 1240 char server[IMBUFSIZ];
1317 1241
1318 /* get current locale modifier */ 1242 /* get current locale modifier */
1319 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1243 if (char *p = XSetLocaleModifiers (0))
1320 { 1244 {
1321 strcpy (server, "@server="); 1245 strcpy (server, "@server=");
1322 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1246 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1323 1247
1324 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1248 if (p = strchr (server + 1, '@')) /* first one only */
1325 *p = '\0'; 1249 *p = '\0';
1326 1250
1327 atom = XInternAtom (display->display, server, False); 1251 atom = XInternAtom (dpy, server, False);
1328 win = XGetSelectionOwner (display->display, atom); 1252 win = XGetSelectionOwner (dpy, atom);
1329 1253
1330 if (win != None) 1254 if (win != None)
1331 return True; 1255 return true;
1332 } 1256 }
1333 1257
1334 return False; 1258 return false;
1335} 1259}
1336 1260
1337void 1261void
1338rxvt_term::IMSendSpot () 1262rxvt_term::im_send_spot ()
1339{ 1263{
1340 XPoint nspot; 1264 XPoint nspot;
1341 XVaNestedList preedit_attr; 1265 XVaNestedList preedit_attr;
1342 1266
1343 if (!Input_Context 1267 if (!Input_Context
1344 || !TermWin.focus 1268 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1269 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1346 return; 1270 return;
1347 1271
1348 im_set_position (nspot); 1272 im_set_position (nspot);
1349 1273
1350 if (nspot.x == spot.x && nspot.y == spot.y) 1274 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1369 input_method = 0; 1293 input_method = 0;
1370 } 1294 }
1371 1295
1372 Input_Context = 0; 1296 Input_Context = 0;
1373} 1297}
1298
1299#ifdef ENABLE_XIM_ONTHESPOT
1300
1301static void
1302xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1303{
1304 ((rxvt_term *)client_data)->make_current ();
1305 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1306}
1307
1308static void
1309xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1310{
1311 ((rxvt_term *)client_data)->make_current ();
1312 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1313}
1314
1315static void
1316xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1317{
1318 rxvt_term *term = (rxvt_term *)client_data;
1319 XIMText *text = call_data->text;
1320
1321 term->make_current ();
1322
1323 if (text)
1324 {
1325 wchar_t *str;
1326
1327 if (!text->encoding_is_wchar && text->string.multi_byte)
1328 {
1329 // of course, X makes it ugly again
1330 if (term->rs[Rs_imLocale])
1331 SET_LOCALE (term->rs[Rs_imLocale]);
1332
1333 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1334 mbstowcs (str, text->string.multi_byte, text->length + 1);
1335
1336 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->locale);
1338 }
1339 else
1340 str = text->string.wide_char;
1341
1342 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1343 DT_INT, call_data->caret,
1344 DT_INT, call_data->chg_first,
1345 DT_INT, call_data->chg_length,
1346 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1347 DT_WCS_LEN, str, str ? (int)text->length : 0,
1348 DT_END));
1349 }
1350 else
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length,
1355 DT_END));
1356}
1357
1358#if 0
1359static void
1360xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1361{
1362 ((rxvt_term *)client_data)->make_current ();
1363 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1364 DT_INT, call_data->position,
1365 DT_INT, call_data->direction,
1366 DT_INT, call_data->style,
1367 DT_END));
1368}
1369#endif
1370
1371#endif
1374 1372
1375/* 1373/*
1376 * Try to open a XIM with the current modifiers, then see if we can 1374 * Try to open a XIM with the current modifiers, then see if we can
1377 * open a suitable preedit type 1375 * open a suitable preedit type
1378 */ 1376 */
1379bool 1377bool
1380rxvt_term::IM_get_IC (const char *modifiers) 1378rxvt_term::im_get_ic (const char *modifiers)
1381{ 1379{
1382 int i, j, found; 1380 int i, j, found;
1383 XIM xim; 1381 XIM xim;
1384 XPoint spot; 1382 XPoint spot;
1385 XRectangle rect, status_rect, needed_rect; 1383 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1384 unsigned long fg, bg;
1387 const char *p; 1385 const char *p;
1388 char **s; 1386 char **s;
1389 XIMStyles *xim_styles; 1387 XIMStyles *xim_styles;
1390 1388
1389 set_environ (env);
1390
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1391 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1392 return false;
1393 1393
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1395 input_method = display->get_xim (locale, modifiers); 1394 input_method = display->get_xim (locale, modifiers);
1396 if (input_method == NULL) 1395 if (input_method == NULL)
1397 return false; 1396 return false;
1398 1397
1399 xim = input_method->xim; 1398 xim = input_method->xim;
… …
1414 p = pet[pi]; 1413 p = pet[pi];
1415 1414
1416 if (!p) 1415 if (!p)
1417 continue; 1416 continue;
1418 1417
1419 s = rxvt_splitcommastring (p); 1418 s = rxvt_strsplit (',', p);
1420 1419
1421 for (i = found = 0; !found && s[i]; i++) 1420 for (i = found = 0; !found && s[i]; i++)
1422 { 1421 {
1423 if (!strcmp (s[i], "OverTheSpot")) 1422 if (!strcmp (s[i], "OverTheSpot"))
1424 input_style = (XIMPreeditPosition | XIMStatusNothing); 1423 input_style = XIMPreeditPosition | XIMStatusNothing;
1425 else if (!strcmp (s[i], "OffTheSpot")) 1424 else if (!strcmp (s[i], "OffTheSpot"))
1426 input_style = (XIMPreeditArea | XIMStatusArea); 1425 input_style = XIMPreeditArea | XIMStatusArea;
1427 else if (!strcmp (s[i], "Root")) 1426 else if (!strcmp (s[i], "Root"))
1428 input_style = (XIMPreeditNothing | XIMStatusNothing); 1427 input_style = XIMPreeditNothing | XIMStatusNothing;
1429 else if (!strcmp (s[i], "None")) 1428 else if (!strcmp (s[i], "None"))
1430 input_style = (XIMPreeditNone | XIMStatusNone); 1429 input_style = XIMPreeditNone | XIMStatusNone;
1430#ifdef ENABLE_XIM_ONTHESPOT
1431 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1432 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1433#endif
1434 else
1435 input_style = XIMPreeditNothing | XIMStatusNothing;
1431 1436
1432 for (j = 0; j < xim_styles->count_styles; j++) 1437 for (j = 0; j < xim_styles->count_styles; j++)
1433 if (input_style == xim_styles->supported_styles[j]) 1438 if (input_style == xim_styles->supported_styles[j])
1434 { 1439 {
1435 rxvt_freecommastring (s); 1440 rxvt_free_strsplit (s);
1436 1441
1437 found = 1; 1442 found = 1;
1438 goto foundpet; 1443 goto foundpet;
1439 } 1444 }
1440 1445
1441 } 1446 }
1442 1447
1443 rxvt_freecommastring (s); 1448 rxvt_free_strsplit (s);
1444 } 1449 }
1445 1450
1446foundpet: 1451foundpet:
1447 1452
1448 XFree (xim_styles); 1453 XFree (xim_styles);
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1474 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1475 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1476 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1477 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1478 "*",
1474 TermWin.fheight, 1479 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1480 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1481 fheight - 2, fheight + 2);
1477 1482
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1483 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1484 &missing_charset_list, &missing_charset_count, &def_string);
1480 1485
1481 if (missing_charset_list) 1486 if (missing_charset_list)
1482 XFreeStringList (missing_charset_list); 1487 XFreeStringList (missing_charset_list);
1483 1488
… …
1524 XNBackground, bg, 1529 XNBackground, bg,
1525 XNArea, &status_rect, 1530 XNArea, &status_rect,
1526 XNFontSet, fs, 1531 XNFontSet, fs,
1527 NULL); 1532 NULL);
1528 } 1533 }
1534#if ENABLE_XIM_ONTHESPOT
1535 else if (input_style & XIMPreeditCallbacks)
1536 {
1537 XIMCallback xcb[4];
1538
1539 im_set_position (spot);
1540
1541 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1542 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1543 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1544# if 0
1545 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1546# endif
1547
1548 preedit_attr = XVaCreateNestedList (0,
1549 XNSpotLocation, &spot,
1550 XNPreeditStartCallback, &xcb[0],
1551 XNPreeditDoneCallback , &xcb[1],
1552 XNPreeditDrawCallback , &xcb[2],
1553# if 0
1554 XNPreeditCaretCallback, &xcb[3],
1555# endif
1556 NULL);
1557 }
1558#endif
1529 1559
1530 Input_Context = XCreateIC (xim, 1560 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1561 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1562 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1563 XNFocusWindow, parent,
1534 preedit_attr ? XNPreeditAttributes : NULL, 1564 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1565 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1566 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1567 status_attr, NULL);
1538 1568
1539 if (preedit_attr) XFree (preedit_attr); 1569 if (preedit_attr) XFree (preedit_attr);
1540 if (status_attr) XFree (status_attr); 1570 if (status_attr) XFree (status_attr);
1541 if (fs) XFreeFontSet (display->display, fs); 1571 if (fs) XFreeFontSet (dpy, fs);
1542 1572
1543 if (Input_Context == NULL) 1573 if (Input_Context == NULL)
1544 { 1574 {
1545 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1575 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1546 im_destroy (); 1576 im_destroy ();
1547 return false; 1577 return false;
1548 } 1578 }
1549 1579
1550 if (input_style & XIMPreeditArea) 1580#if 0
1551 IMSetStatusPosition (); 1581 // unfortunately, only the focus window is used by XIM, hard to fix
1582 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1583 vt_select_input ();
1584#endif
1552 1585
1553 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); 1586 im_set_position ();
1587
1554 return true; 1588 return true;
1555} 1589}
1556 1590
1557void 1591void
1558rxvt_term::im_cb () 1592rxvt_term::im_cb ()
1559{ 1593{
1560 int i, found, had_im; 1594 int i;
1561 const char *p; 1595 const char *p;
1562 char **s; 1596 char **s;
1563 char buf[IMBUFSIZ]; 1597 char buf[IMBUFSIZ];
1564 1598
1565 SET_R (this); 1599 make_current ();
1566 1600
1567 im_destroy (); 1601 im_destroy ();
1568 1602
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1603 if (Input_Context)
1571 return; 1604 return;
1572 1605
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1606 if (rs[Rs_imLocale])
1575 SET_LOCALE (rs[Rs_imLocale]); 1607 SET_LOCALE (rs[Rs_imLocale]);
1576#endif
1577 1608
1578 p = rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1579 if (p && *p) 1610 if (p && *p)
1580 { 1611 {
1581 bool found = false; 1612 bool found = false;
1582 1613
1583 s = rxvt_splitcommastring (p); 1614 s = rxvt_strsplit (',', p);
1584 1615
1585 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1586 { 1617 {
1587 if (*s[i]) 1618 if (*s[i])
1588 { 1619 {
1589 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
1590 strncat (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1591 if (IM_get_IC (buf)) 1622 if (im_get_ic (buf))
1592 { 1623 {
1593 found = true; 1624 found = true;
1594 break; 1625 break;
1595 } 1626 }
1596 } 1627 }
1597 } 1628 }
1598 1629
1599 rxvt_freecommastring (s); 1630 rxvt_free_strsplit (s);
1600 1631
1601 if (found) 1632 if (found)
1602 goto done; 1633 goto done;
1603 } 1634 }
1604 1635
1605 /* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1606 if (IM_get_IC ("")) 1637 if (im_get_ic (""))
1607 goto done; 1638 goto done;
1608 1639
1609 /* try with no modifiers base IF the user didn't specify an IM */ 1640 /* try with no modifiers base IF the user didn't specify an IM */
1610 if (IM_get_IC ("@im=none")) 1641 if (im_get_ic ("@im=none"))
1611 goto done; 1642 goto done;
1612 1643
1613done: 1644done:
1614#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1615 if (rs[Rs_imLocale]) 1645 if (rs[Rs_imLocale])
1616 SET_LOCALE (locale); 1646 SET_LOCALE (locale);
1617#endif
1618} 1647}
1619 1648
1620void 1649void
1621rxvt_term::IMSetStatusPosition () 1650rxvt_term::im_set_position ()
1622{ 1651{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1625 1654
1626 if (!Input_Context 1655 if (!Input_Context
1627 || !TermWin.focus 1656 || !focus
1628 || !(input_style & XIMPreeditArea) 1657 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1629 || !IMisRunning ()) 1658 || !im_is_running ())
1630 return; 1659 return;
1631 1660
1661 if (input_style & XIMPreeditPosition)
1662 {
1663 im_set_size (preedit_rect);
1664 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1665
1666 XSetICValues (Input_Context,
1667 XNPreeditAttributes, preedit_attr, NULL);
1668 }
1669 else
1670 {
1632 /* Getting the necessary width of preedit area */ 1671 /* Getting the necessary width of preedit area */
1633 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1672 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1634 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1673 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1635 XFree (status_attr); 1674 XFree (status_attr);
1636 1675
1637 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1676 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1638 XFree (needed_rect); 1677 XFree (needed_rect);
1639 1678
1640 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1679 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1641 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1680 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1642 1681
1643 XSetICValues (Input_Context, 1682 XSetICValues (Input_Context,
1644 XNPreeditAttributes, preedit_attr, 1683 XNPreeditAttributes, preedit_attr,
1645 XNStatusAttributes, status_attr, NULL); 1684 XNStatusAttributes, status_attr,
1685 NULL);
1646 1686
1687 XFree (status_attr);
1688 }
1689
1647 XFree (preedit_attr); 1690 XFree (preedit_attr);
1648 XFree (status_attr);
1649} 1691}
1650#endif /* USE_XIM */ 1692#endif /* USE_XIM */
1651 1693
1652/*----------------------------------------------------------------------*/ 1694void
1653rxvt_t rxvt_current_term; 1695rxvt_term::get_window_origin (int &x, int &y)
1696{
1697 Window cr;
1698 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1699}
1654 1700
1655/*----------------------- end-of-file (C source) -----------------------*/ 1701/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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