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

Diff Legend

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