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.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.77 by root, Tue Aug 10 20:39:19 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.16 2003/12/18 07:31:19 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#include <cstring>
48 48
49vector<rxvt_term *> rxvt_term::termlist;
50
49static char curlocale[128]; 51static char curlocale[128];
50 52
51void 53bool
52rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
53{ 55{
54 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !STRNCMP (locale, curlocale, 128))
55 { 57 return false;
58
56 STRNCPY (curlocale, locale, 128); 59 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
61 return true;
62}
63
64#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite;
66
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{
69 compose_char *cc;
70
71 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1];
74 while (cc)
58 } 75 {
76 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1];
78 }
79
80 // check to see wether this combination already exists otherwise
81 for (cc = v.end (); cc-- > v.begin (); )
82 {
83 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ());
85 }
86
87 // allocate a new combination
88 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
89 {
90 static int seen;
91
92 if (!seen++)
93 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
94
95 return REPLACEMENT_CHAR;
96 }
97
98 v.push_back (compose_char (c1, c2));
99
100 return v.size () - 1 + COMPOSE_LO;
59} 101}
102
103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
104{
105 compose_char *cc = (*this)[c];
106
107 if (!cc)
108 {
109 if (r) *r = c;
110 return 1;
111 }
112
113 int len = expand (cc->c1, r);
114
115 if (r) r += len;
116
117 if (cc->c2 != NOCHAR)
118 {
119 len++;
120 if (r) *r++ = cc->c2;
121 }
122
123 return len;
124
125}
126#endif
60 127
61void * 128void *
62rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
63{ 130{
64 void *p = malloc (s); 131 void *p = malloc (s);
72{ 139{
73 free (p); 140 free (p);
74} 141}
75 142
76rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
144 :
145 rootwin_ev (this, &rxvt_term::rootwin_cb),
146 termwin_ev (this, &rxvt_term::x_cb),
77: pty_ev (this, &rxvt_term::pty_cb), 147 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
78#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
79 blink_ev (this, &rxvt_term::blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
80#endif 168#endif
81#ifdef POINTER_BLANK 169#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif 171#endif
172#ifdef USE_XIM
84 x_ev (this, &rxvt_term::x_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif
175 check_ev (this, &rxvt_term::check_cb),
176 flush_ev (this, &rxvt_term::flush_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
86 check_ev (this, &rxvt_term::check_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
87 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
88{ 180{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 181 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
182
183 termlist.push_back (this);
90} 184}
91 185
92rxvt_term::~rxvt_term () 186rxvt_term::~rxvt_term ()
93{ 187{
94 scr_release (); 188 termlist.erase (find (termlist.begin (), termlist.end(), this));
95
96 free (locale);
97 free (codeset);
98
99#ifndef NO_SETOWNER_TTYDEV
100 rxvt_privileged_ttydev (this, RESTORE);
101#endif
102#ifdef UTMP_SUPPORT
103 rxvt_privileged_utmp (this, RESTORE);
104#endif
105#ifdef USE_XIM
106 if (Input_Context != NULL)
107 {
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112 189
113 if (cmd_fd >= 0) 190 if (cmd_fd >= 0)
114 close (cmd_fd); 191 close (cmd_fd);
115 192
116 if (Xfd >= 0) 193#ifndef NO_SETOWNER_TTYDEV
117 XCloseDisplay (Xdisplay); 194 privileged_ttydev (RESTORE);
195#endif
196#ifdef UTMP_SUPPORT
197 privileged_utmp (RESTORE);
198#endif
118 199
200 delete TermWin.fontset;
201
202 if (display)
203 {
204 selection_clear ();
205
206#ifdef USE_XIM
207 im_destroy ();
208#endif
209#ifdef MENUBAR
210 if (menubarGC) XFreeGC (display->display, menubarGC);
211#endif
212#ifdef XTERM_SCROLLBAR
213 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
214 if (ShadowGC) XFreeGC (display->display, ShadowGC);
215#endif
216#ifdef PLAIN_SCROLLBAR
217 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
218#endif
219#ifdef NEXT_SCROLLBAR
220 if (blackGC) XFreeGC (display->display, blackGC);
221 if (whiteGC) XFreeGC (display->display, whiteGC);
222 if (grayGC) XFreeGC (display->display, grayGC);
223 if (darkGC) XFreeGC (display->display, darkGC);
224 if (stippleGC) XFreeGC (display->display, stippleGC);
225 if (dimple) XFreePixmap (display->display, dimple);
226 if (upArrow) XFreePixmap (display->display, upArrow);
227 if (downArrow) XFreePixmap (display->display, downArrow);
228 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
229 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
230#endif
231#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
232 if (topShadowGC) XFreeGC (display->display, topShadowGC);
233 if (botShadowGC) XFreeGC (display->display, botShadowGC);
234 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
235#endif
236 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
237
238#if defined(MENUBAR) && (MENUBAR_MAX > 1)
239 delete menuBar.drawable;
240 //if (menuBar.win)
241 // XDestroyWindow (display->display, menuBar.win);
242#endif
243 delete TermWin.drawable;
244 // destroy all windows
245 if (TermWin.parent[0])
246 XDestroyWindow (display->display, TermWin.parent[0]);
247 }
248
249 // TODO: free pixcolours, colours should become part of rxvt_display
250
119 delete PixColors; 251 delete PixColorsFocused;
252#ifdef OFF_FOCUS_FADING
253 delete PixColorsUnFocused;
254#endif
255
256 displays.put (display);
257
258 scr_release ();
259
260 /* clear all resources */
261 for (int i = 0; i < allocated.size (); i++)
262 free (allocated[i]);
263
264 free (selection.text);
265 // TODO: manage env vars in child only(!)
266 free (env_windowid);
267 free (env_display);
268 free (env_term);
269 free (env_colorfgbg);
270 free (locale);
271#if 0
272 free (codeset);
273#endif
274
275 delete envv;
276 delete argv;
120} 277}
121 278
122void 279void
123rxvt_term::destroy () 280rxvt_term::destroy ()
124{ 281{
282 if (destroy_ev.active)
283 return;
284
285 if (display)
286 {
287#ifdef USE_XIM
288 im_ev.stop (display);
289#endif
290#ifdef HAVE_SCROLLBARS
291 scrollbar_ev.stop (display);
292#endif
293#ifdef MENUBAR
294 menubar_ev.stop (display);
295#endif
296 rootwin_ev.stop (display);
297 termwin_ev.stop (display);
298 vt_ev.stop (display);
299 }
300
125 check_ev.stop (); 301 check_ev.stop ();
126 pty_ev.stop (); 302 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK 303#ifdef CURSOR_BLINK
304 cursor_blink_ev.stop ();
305#endif
306#ifdef TEXT_BLINK
129 blink_ev.stop (); 307 text_blink_ev.stop ();
308#endif
309#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
310 cont_scroll_ev.stop ();
311#endif
312#ifdef SELECTION_SCROLLING
313 sel_scroll_ev.stop ();
130#endif 314#endif
131#ifdef POINTER_BLANK 315#ifdef POINTER_BLANK
132 pointer_ev.stop (); 316 pointer_ev.stop ();
133#endif 317#endif
134 318
142 326
143 delete this; 327 delete this;
144} 328}
145 329
146/*----------------------------------------------------------------------*/ 330/*----------------------------------------------------------------------*/
147/* rxvt_init() */ 331/* rxvt_init () */
148/* LIBPROTO */ 332bool
149rxvt_t
150rxvt_init (int argc, const char *const *argv) 333rxvt_term::init (int argc, const char *const *argv)
151{ 334{
152 SET_R (new rxvt_term); 335 SET_R (this);
153 dR;
154 336
155 if (!R->init_vars () || !R->init (argc, argv)) 337 if (!init_vars ())
156 { 338 return false;
157 delete R; 339
158 return NULL; 340 /*
341 * Save and then give up any super-user privileges
342 * If we need privileges in any area then we must specifically request it.
343 * We should only need to be root in these cases:
344 * 1. write utmp entries on some systems
345 * 2. chown tty on some systems
346 */
347 privileges (SAVE);
348 privileges (IGNORE);
349
350 init_secondary ();
351
352 const char **cmd_argv = init_resources (argc, argv);
353
354 set_locale ("");
355
356#if MENUBAR_MAX
357 menubar_read (rs[Rs_menu]);
358#endif
359#ifdef HAVE_SCROLLBARS
360 if (Options & Opt_scrollBar)
361 scrollBar.setIdle (); /* set existence for size calculations */
362#endif
363
364 create_windows (argc, argv);
365
366 init_xlocale ();
367
368 scr_reset (); /* initialize screen */
369
370#if 0
371 XSynchronize (display->display, True);
372#endif
373
374#ifdef HAVE_SCROLLBARS
375 if (Options & Opt_scrollBar)
376 resize_scrollbar (); /* create and map scrollbar */
377#endif
378#if (MENUBAR_MAX)
379 if (menubar_visible ())
380 XMapWindow (display->display, menuBar.win);
381#endif
382#ifdef TRANSPARENT
383 if (Options & Opt_transparent)
159 } 384 {
385 XSelectInput (display->display, display->root, PropertyChangeMask);
386 check_our_parents ();
387 }
388#endif
160 389
390 rootwin_ev.start (display, display->root);
391
392 XMapWindow (display->display, TermWin.vt);
393 XMapWindow (display->display, TermWin.parent[0]);
394
395 init_command (cmd_argv);
396
397 pty_ev.start (cmd_fd, EVENT_READ);
398
399 check_ev.start ();
400
161 return R; 401 return true;
162} 402}
163 403
164/* EXTPROTO */ 404static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
405
165void 406void
166rxvt_init_signals () 407rxvt_init_signals ()
167{ 408{
168/* install exit handler for cleanup */ 409 /* install exit handler for cleanup */
169#if 0 410#if 0
170#ifdef HAVE_ATEXIT 411#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit); 412 atexit (rxvt_clean_exit);
172#else 413#else
173#endif 414#endif
174#endif 415#endif
175 416
176 struct sigaction sa; 417 struct sigaction sa;
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 423 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 424 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 425 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 426 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186 427
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 428 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */ 429 /* signal (SIGURG, SIG_DFL); */
189 430
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 431 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 432 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192}
193
194bool
195rxvt_term::init (int argc, const char *const *argv)
196{
197 /*
198 * Save and then give up any super-user privileges
199 * If we need privileges in any area then we must specifically request it.
200 * We should only need to be root in these cases:
201 * 1. write utmp entries on some systems
202 * 2. chown tty on some systems
203 */
204 rxvt_privileges (this, SAVE);
205 rxvt_privileges (this, IGNORE);
206
207 init_secondary ();
208
209 const char **cmd_argv = init_resources (argc, argv);
210
211 set_locale ("");
212
213#if (MENUBAR_MAX)
214 rxvt_menubar_read (this, rs[Rs_menu]);
215#endif
216#ifdef HAVE_SCROLLBARS
217 if (Options & Opt_scrollBar)
218 scrollBar.setIdle (); /* set existence for size calculations */
219#endif
220
221 rxvt_Create_Windows (this, argc, argv);
222
223 init_xlocale ();
224
225 scr_reset (); /* initialize screen */
226#ifdef RXVT_GRAPHICS
227 rxvt_Gr_reset (this); /* reset graphics */
228#endif
229
230#if 0
231#ifdef DEBUG_X
232 XSynchronize(Xdisplay, True);
233#endif
234#endif
235
236#ifdef HAVE_SCROLLBARS
237 if (Options & Opt_scrollBar)
238 rxvt_Resize_scrollBar (this); /* create and map scrollbar */
239#endif
240#if (MENUBAR_MAX)
241 if (menubar_visible(r))
242 XMapWindow (Xdisplay, menuBar.win);
243#endif
244#ifdef TRANSPARENT
245 if (Options & Opt_transparent)
246 {
247 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
248 rxvt_check_our_parents (this);
249 }
250#endif
251 XMapWindow (Xdisplay, TermWin.vt);
252 XMapWindow (Xdisplay, TermWin.parent[0]);
253
254 init_env ();
255 init_command (cmd_argv);
256
257 x_ev.start (Xfd, EVENT_READ);
258 pty_ev.start (cmd_fd, EVENT_READ);
259
260 check_ev.start ();
261
262 process_x_events ();
263
264 return true;
265} 433}
266 434
267/* ------------------------------------------------------------------------- * 435/* ------------------------------------------------------------------------- *
268 * SIGNAL HANDLING & EXIT HANDLER * 436 * SIGNAL HANDLING & EXIT HANDLER *
269 * ------------------------------------------------------------------------- */ 437 * ------------------------------------------------------------------------- */
270/* 438/*
271 * Catch a SIGCHLD signal and exit if the direct child has died 439 * Catch a SIGCHLD signal and exit if the direct child has died
272 */ 440 */
441
442void rxvt_term::child_exited (int pid)
443{
444 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
445 if (pid == (*t)->cmd_pid)
446 {
447 (*t)->destroy ();
448 break;
449 }
450}
451
273/* ARGSUSED */ 452/* ARGSUSED */
274/* EXTPROTO */ 453/* EXTPROTO */
275RETSIGTYPE 454RETSIGTYPE
276rxvt_Child_signal(int sig __attribute__ ((unused))) 455rxvt_Child_signal (int sig __attribute__ ((unused)))
277{ 456{
278 int pid, save_errno = errno; 457 int pid, save_errno = errno;
458
279 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 459 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
280 ; 460 rxvt_term::child_exited (pid);
461
281 errno = save_errno; 462 errno = save_errno;
282
283#if 0
284 if (pid == R->cmd_pid)
285 exit (EXIT_SUCCESS);
286#endif
287} 463}
288 464
289/* 465/*
290 * Catch a fatal signal and tidy up before quitting 466 * Catch a fatal signal and tidy up before quitting
291 */ 467 */
292/* EXTPROTO */ 468/* EXTPROTO */
293RETSIGTYPE 469RETSIGTYPE
294rxvt_Exit_signal(int sig) 470rxvt_Exit_signal (int sig)
295{ 471{
296 signal(sig, SIG_DFL); 472 signal (sig, SIG_DFL);
297#ifdef DEBUG_CMD 473#ifdef DEBUG_CMD
298 rxvt_print_error("signal %d", sig); 474 rxvt_warn ("caught signal %d, exiting.\n", sig);
299#endif 475#endif
300 rxvt_clean_exit(); 476 rxvt_clean_exit ();
301 kill(getpid(), sig); 477 kill (getpid (), sig);
302} 478}
303 479
304/* ARGSUSED */
305/* INTPROTO */ 480/* INTPROTO */
306int 481int
307rxvt_xerror_handler(const Display * display 482rxvt_xerror_handler (Display *display, XErrorEvent *event)
308 __attribute__ ((unused)), const XErrorEvent * event)
309{ 483{
310 dR;
311
312 if (R->allowedxerror == -1) 484 if (GET_R->allowedxerror == -1)
313 R->allowedxerror = event->error_code; 485 GET_R->allowedxerror = event->error_code;
314 else 486 else
315 { 487 {
316 rxvt_print_error("XError: Request: %d . %d, Error: %d", 488 old_xerror_handler (display, event);
317 event->request_code, event->minor_code,
318 event->error_code);
319
320 R->destroy (); 489 GET_R->destroy ();
321 } 490 }
322 491
323 return 0; 492 return 0;
324} 493}
325 494
330 */ 499 */
331/* EXTPROTO */ 500/* EXTPROTO */
332void 501void
333rxvt_clean_exit () 502rxvt_clean_exit ()
334{ 503{
335 dR; 504 // TODO: rxvtd should clean up all ressources
336 505 if (GET_R)
337 R->destroy (); 506 GET_R->destroy ();
338} 507}
339 508
340/* ------------------------------------------------------------------------- * 509/* ------------------------------------------------------------------------- *
341 * MEMORY ALLOCATION WRAPPERS * 510 * MEMORY ALLOCATION WRAPPERS *
342 * ------------------------------------------------------------------------- */ 511 * ------------------------------------------------------------------------- */
343/* EXTPROTO */ 512/* EXTPROTO */
344void * 513void *
345rxvt_malloc(size_t size) 514rxvt_malloc (size_t size)
346{ 515{
347 void *p; 516 void *p;
348 517
349 p = malloc(size); 518 p = malloc (size);
350 if (p) 519 if (p)
351 return p; 520 return p;
352 521
353 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 522 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
354 rxvt_clean_exit(); 523 rxvt_clean_exit ();
355 exit(EXIT_FAILURE); 524 exit (EXIT_FAILURE);
356/* NOTREACHED */ 525 /* NOTREACHED */
357} 526}
358 527
359/* EXTPROTO */ 528/* EXTPROTO */
360void * 529void *
361rxvt_calloc(size_t number, size_t size) 530rxvt_calloc (size_t number, size_t size)
362{ 531{
363 void *p; 532 void *p;
364 533
365 p = calloc(number, size); 534 p = calloc (number, size);
366 if (p) 535 if (p)
367 return p; 536 return p;
368 537
369 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 538 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
370 rxvt_clean_exit(); 539 rxvt_clean_exit ();
371 exit(EXIT_FAILURE); 540 exit (EXIT_FAILURE);
372/* NOTREACHED */ 541 /* NOTREACHED */
373} 542}
374 543
375/* EXTPROTO */ 544/* EXTPROTO */
376void * 545void *
377rxvt_realloc(void *ptr, size_t size) 546rxvt_realloc (void *ptr, size_t size)
378{ 547{
379 void *p; 548 void *p;
380 549
381 if (ptr) 550 if (ptr)
382 p = realloc(ptr, size); 551 p = realloc (ptr, size);
383 else 552 else
384 p = malloc(size); 553 p = malloc (size);
385 if (p) 554 if (p)
386 return p; 555 return p;
387 556
388 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 557 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
389 rxvt_clean_exit(); 558 rxvt_clean_exit ();
390 exit(EXIT_FAILURE); 559 exit (EXIT_FAILURE);
391/* NOTREACHED */ 560 /* NOTREACHED */
392} 561}
393 562
394/* ------------------------------------------------------------------------- * 563/* ------------------------------------------------------------------------- *
395 * PRIVILEGED OPERATIONS * 564 * PRIVILEGED OPERATIONS *
396 * ------------------------------------------------------------------------- */ 565 * ------------------------------------------------------------------------- */
397/* take care of suid/sgid super-user (root) privileges */ 566/* take care of suid/sgid super-user (root) privileges */
398/* INTPROTO */
399void 567void
400rxvt_privileges(pR_ int mode) 568rxvt_term::privileges (int mode)
401{ 569{
402#if ! defined(__CYGWIN32__) 570#if ! defined(__CYGWIN32__)
403# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 571# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
404/* setreuid() is the poor man's setuid(), seteuid() */ 572 /* setreuid () is the poor man's setuid (), seteuid () */
405# define seteuid(a) setreuid(-1, (a)) 573# define seteuid(a) setreuid(-1, (a))
406# define setegid(a) setregid(-1, (a)) 574# define setegid(a) setregid(-1, (a))
407# define HAVE_SETEUID 575# define HAVE_SETEUID
408# endif 576# endif
409# ifdef HAVE_SETEUID 577# ifdef HAVE_SETEUID
410 switch (mode) { 578 switch (mode)
579 {
411 case IGNORE: 580 case IGNORE:
412 /* 581 /*
413 * change effective uid/gid - not real uid/gid - so we can switch 582 * change effective uid/gid - not real uid/gid - so we can switch
414 * back to root later, as required 583 * back to root later, as required
415 */ 584 */
416 seteuid(getuid()); 585 seteuid (getuid ());
417 setegid(getgid()); 586 setegid (getgid ());
418 break; 587 break;
419 case SAVE: 588 case SAVE:
420 R->euid = geteuid(); 589 euid = geteuid ();
421 R->egid = getegid(); 590 egid = getegid ();
422 break; 591 break;
423 case RESTORE: 592 case RESTORE:
424 seteuid(R->euid); 593 seteuid (euid);
425 setegid(R->egid); 594 setegid (egid);
426 break; 595 break;
427 } 596 }
428# else 597# else
429 switch (mode) { 598 switch (mode)
599 {
430 case IGNORE: 600 case IGNORE:
431 setuid(getuid()); 601 setuid (getuid ());
432 setgid(getgid()); 602 setgid (getgid ());
433 /* FALLTHROUGH */ 603 /* FALLTHROUGH */
434 case SAVE: 604 case SAVE:
435 /* FALLTHROUGH */ 605 /* FALLTHROUGH */
436 case RESTORE: 606 case RESTORE:
437 break; 607 break;
438 } 608 }
439# endif 609# endif
440#endif 610#endif
441} 611}
442 612
443#ifdef UTMP_SUPPORT 613#ifdef UTMP_SUPPORT
444/* EXTPROTO */
445void 614void
446rxvt_privileged_utmp(pR_ char action) 615rxvt_term::privileged_utmp (char action)
447{ 616{
448 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 617 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
449 action, R->next_utmp_action, getpid())); 618 action, next_utmp_action, getpid ()));
450 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 619 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
451 || (R->Options & Opt_utmpInhibit) 620 || (Options & Opt_utmpInhibit)
452 || R->ttydev == NULL || *R->ttydev == '\0') 621 || ttydev == NULL || *ttydev == '\0')
453 return; 622 return;
454 623
455 rxvt_privileges(aR_ RESTORE); 624 privileges (RESTORE);
456 if (action == SAVE) { 625 if (action == SAVE)
626 {
457 R->next_utmp_action = RESTORE; 627 next_utmp_action = RESTORE;
458 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 628 makeutent (ttydev, rs[Rs_display_name]);
629 }
630 else
459 } else { /* action == RESTORE */ 631 { /* action == RESTORE */
460 R->next_utmp_action = IGNORE; 632 next_utmp_action = IGNORE;
461 rxvt_cleanutent(aR); 633 cleanutent ();
462 } 634 }
463 rxvt_privileges(aR_ IGNORE); 635 privileges (IGNORE);
464} 636}
465#endif 637#endif
466 638
467#ifndef NO_SETOWNER_TTYDEV 639#ifndef NO_SETOWNER_TTYDEV
468/* EXTPROTO */
469void 640void
470rxvt_privileged_ttydev(pR_ char action) 641rxvt_term::privileged_ttydev (char action)
471{ 642{
472 D_MAIN((stderr, 643 D_MAIN ((stderr,
473 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 644 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
474 action, R->next_tty_action, getpid())); 645 action, next_tty_action, getpid ()));
475 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 646 if (next_tty_action != action || (action != SAVE && action != RESTORE)
476 || R->ttydev == NULL || *R->ttydev == '\0') 647 || ttydev == NULL || *ttydev == '\0')
477 return; 648 return;
478 649
479 rxvt_privileges(aR_ RESTORE); 650 privileges (RESTORE);
480 651
481 if (action == SAVE) { 652 if (action == SAVE)
653 {
482 R->next_tty_action = RESTORE; 654 next_tty_action = RESTORE;
483# ifndef RESET_TTY_TO_COMMON_DEFAULTS 655# ifndef RESET_TTY_TO_COMMON_DEFAULTS
484/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 656 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
485 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 657 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
486 R->next_tty_action = IGNORE; 658 next_tty_action = IGNORE;
487 else 659 else
488# endif 660# endif
661
489 { 662 {
490 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 663 chown (ttydev, getuid (), ttygid); /* fail silently */
491 chmod(R->ttydev, R->ttymode); 664 chmod (ttydev, ttymode);
492# ifdef HAVE_REVOKE 665# ifdef HAVE_REVOKE
493 revoke(R->ttydev); 666 revoke (ttydev);
494# endif 667# endif
668
495 } 669 }
670 }
671 else
496 } else { /* action == RESTORE */ 672 { /* action == RESTORE */
497 R->next_tty_action = IGNORE; 673 next_tty_action = IGNORE;
498# ifndef RESET_TTY_TO_COMMON_DEFAULTS 674# ifndef RESET_TTY_TO_COMMON_DEFAULTS
499 chmod(R->ttydev, R->ttyfd_stat.st_mode); 675 chmod (ttydev, ttyfd_stat.st_mode);
500 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 676 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
501# else 677# else
502 chmod(R->ttydev, 678 chmod (ttydev,
503 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 679 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
504 chown(R->ttydev, 0, 0); 680 chown (ttydev, 0, 0);
505# endif 681# endif
506 }
507 682
683 }
684
508 rxvt_privileges(aR_ IGNORE); 685 privileges (IGNORE);
509 686
510# ifndef RESET_TTY_TO_COMMON_DEFAULTS 687# ifndef RESET_TTY_TO_COMMON_DEFAULTS
511 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 688 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
512 action == RESTORE ? "Restoring" : (action == 689 action == RESTORE ? "Restoring" : (action ==
513 SAVE ? "Saving" : 690 SAVE ? "Saving" :
514 "UNKNOWN ERROR for"), R->ttydev, 691 "UNKNOWN ERROR for"), ttydev,
515 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 692 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
516 R->ttyfd_stat.st_gid)); 693 ttyfd_stat.st_gid));
517# endif 694# endif
518} 695}
519#endif 696#endif
520 697
521/*----------------------------------------------------------------------*/ 698/*----------------------------------------------------------------------*/
522/* 699/*
523 * window size/position calculcations for XSizeHint and other storage. 700 * window size/position calculcations for XSizeHint and other storage.
524 * if width/height are non-zero then override calculated width/height 701 * if width/height are non-zero then override calculated width/height
525 */ 702 */
526/* EXTPROTO */
527void 703void
528rxvt_window_calc(pR_ unsigned int width, unsigned int height) 704rxvt_term::window_calc (unsigned int width, unsigned int height)
529{ 705{
530 short recalc_x, recalc_y; 706 short recalc_x, recalc_y;
531 int x, y, sb_w, mb_h, flags; 707 int x, y, sb_w, mb_h, flags;
532 unsigned int w, h; 708 unsigned int w, h;
533 unsigned int max_width, max_height; 709 unsigned int max_width, max_height;
534 710
535 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 711 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
536 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 712 TermWin.ncol, TermWin.nrow, szHint.width,
537 R->szHint.height)); 713 szHint.height));
538 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 714 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 R->szHint.win_gravity = NorthWestGravity; 715 szHint.win_gravity = NorthWestGravity;
540/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 716 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
541 717
542 recalc_x = recalc_y = 0; 718 recalc_x = recalc_y = 0;
543 flags = 0; 719 flags = 0;
544 if (!R->parsed_geometry) { 720 if (!parsed_geometry)
721 {
545 R->parsed_geometry = 1; 722 parsed_geometry = 1;
546 if (R->rs[Rs_geometry]) 723 if (rs[Rs_geometry])
547 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 724 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
548 if (flags & WidthValue) { 725 if (flags & WidthValue)
726 {
549 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 727 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
550 R->szHint.flags |= USSize; 728 szHint.flags |= USSize;
551 } 729 }
552 if (flags & HeightValue) { 730 if (flags & HeightValue)
731 {
553 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 732 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
554 R->szHint.flags |= USSize; 733 szHint.flags |= USSize;
555 } 734 }
556 if (flags & XValue) { 735 if (flags & XValue)
736 {
557 R->szHint.x = x; 737 szHint.x = x;
558 R->szHint.flags |= USPosition; 738 szHint.flags |= USPosition;
559 if (flags & XNegative) { 739 if (flags & XNegative)
740 {
560 recalc_x = 1; 741 recalc_x = 1;
561 R->szHint.win_gravity = NorthEastGravity; 742 szHint.win_gravity = NorthEastGravity;
562 } 743 }
563 } 744 }
564 if (flags & YValue) { 745 if (flags & YValue)
746 {
565 R->szHint.y = y; 747 szHint.y = y;
566 R->szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
567 if (flags & YNegative) { 749 if (flags & YNegative)
750 {
568 recalc_y = 1; 751 recalc_y = 1;
569 if (R->szHint.win_gravity == NorthEastGravity) 752 if (szHint.win_gravity == NorthEastGravity)
570 R->szHint.win_gravity = SouthEastGravity; 753 szHint.win_gravity = SouthEastGravity;
571 else 754 else
572 R->szHint.win_gravity = SouthWestGravity; 755 szHint.win_gravity = SouthWestGravity;
573 } 756 }
574 } 757 }
575 } 758 }
759
576/* TODO: BOUNDS */ 760 /* TODO: BOUNDS */
577 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 761 TermWin.width = TermWin.ncol * TermWin.fwidth;
578 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 762 TermWin.height = TermWin.nrow * TermWin.fheight;
579 max_width = MAX_COLS * R->TermWin.fwidth; 763 max_width = MAX_COLS * TermWin.fwidth;
580 max_height = MAX_ROWS * R->TermWin.fheight; 764 max_height = MAX_ROWS * TermWin.fheight;
581 765
582 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 766 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
583 767
584 sb_w = mb_h = 0; 768 sb_w = mb_h = 0;
585 R->window_vt_x = R->window_vt_y = 0; 769 window_vt_x = window_vt_y = TermWin.int_bwidth;
770
586 if (scrollbar_visible(R)) { 771 if (scrollbar_visible ())
772 {
587 sb_w = scrollbar_TotalWidth(); 773 sb_w = scrollbar_TotalWidth ();
588 R->szHint.base_width += sb_w; 774 szHint.base_width += sb_w;
589 if (!(R->Options & Opt_scrollBar_right)) 775 if (!(Options & Opt_scrollBar_right))
590 R->window_vt_x = sb_w; 776 window_vt_x += sb_w;
591 } 777 }
778
592 if (menubar_visible(R)) { 779 if (menubar_visible ())
780 {
593 mb_h = menuBar_TotalHeight(); 781 mb_h = menuBar_TotalHeight ();
594 R->szHint.base_height += mb_h; 782 szHint.base_height += mb_h;
595 R->window_vt_y = mb_h; 783 window_vt_y += mb_h;
596 } 784 }
785
597 R->szHint.width_inc = R->TermWin.fwidth; 786 szHint.width_inc = TermWin.fwidth;
598 R->szHint.height_inc = R->TermWin.fheight; 787 szHint.height_inc = TermWin.fheight;
599 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 788 szHint.min_width = szHint.base_width + szHint.width_inc;
600 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 789 szHint.min_height = szHint.base_height + szHint.height_inc;
601 790
602 if (width && width - R->szHint.base_width < max_width) { 791 if (width && width - szHint.base_width < max_width)
792 {
603 R->szHint.width = width; 793 szHint.width = width;
604 R->TermWin.width = width - R->szHint.base_width; 794 TermWin.width = width - szHint.base_width;
605 } else { 795 }
796 else
797 {
606 MIN_IT(R->TermWin.width, max_width); 798 MIN_IT (TermWin.width, max_width);
607 R->szHint.width = R->szHint.base_width + R->TermWin.width; 799 szHint.width = szHint.base_width + TermWin.width;
608 } 800 }
801
609 if (height && height - R->szHint.base_height < max_height) { 802 if (height && height - szHint.base_height < max_height)
803 {
610 R->szHint.height = height; 804 szHint.height = height;
611 R->TermWin.height = height - R->szHint.base_height; 805 TermWin.height = height - szHint.base_height;
612 } else { 806 }
807 else
808 {
613 MIN_IT(R->TermWin.height, max_height); 809 MIN_IT (TermWin.height, max_height);
614 R->szHint.height = R->szHint.base_height + R->TermWin.height; 810 szHint.height = szHint.base_height + TermWin.height;
615 } 811 }
812
616 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 813 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
617 R->window_sb_x = R->szHint.width - sb_w; 814 window_sb_x = szHint.width - sb_w;
618 815
619 if (recalc_x) 816 if (recalc_x)
620 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 817 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
621 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 818 - szHint.width - 2 * TermWin.ext_bwidth);
622 if (recalc_y) 819 if (recalc_y)
623 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 820 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
624 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 821 - szHint.height - 2 * TermWin.ext_bwidth);
625 822
626 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 823 TermWin.ncol = TermWin.width / TermWin.fwidth;
627 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 824 TermWin.nrow = TermWin.height / TermWin.fheight;
628 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
629 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 826 TermWin.ncol, TermWin.nrow, szHint.width,
630 R->szHint.height)); 827 szHint.height));
631 return; 828 return;
632} 829}
633 830
634/*----------------------------------------------------------------------*/ 831/*----------------------------------------------------------------------*/
635/* 832/*
636 * Tell the teletype handler what size the window is. 833 * Tell the teletype handler what size the window is.
637 * Called after a window size change. 834 * Called after a window size change.
638 */ 835 */
639void 836void
640rxvt_term::tt_winch () 837rxvt_term::tt_winch ()
641{ 838{
642 struct winsize ws; 839 struct winsize ws;
643 840
644 if (cmd_fd < 0) 841 if (cmd_fd < 0)
645 return; 842 return;
646 843
647 ws.ws_col = TermWin.ncol; 844 ws.ws_col = TermWin.ncol;
649 ws.ws_xpixel = ws.ws_ypixel = 0; 846 ws.ws_xpixel = ws.ws_ypixel = 0;
650#ifndef DEBUG_SIZE 847#ifndef DEBUG_SIZE
651 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 848 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
652#else 849#else
653 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 850 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
654 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 851 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
655# ifdef SIGWINCH 852# ifdef SIGWINCH
656 else if (cmd_pid) /* force through to the command */ 853 else if (cmd_pid) /* force through to the command */
657 kill (cmd_pid, SIGWINCH); 854 kill (cmd_pid, SIGWINCH);
658# endif 855# endif
659#endif 856#endif
660} 857}
661 858
662/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
663/* rxvt_change_font() - Switch to a new font */ 860/* rxvt_change_font () - Switch to a new font */
664/* 861/*
665 * init = 1 - initialize 862 * init = 1 - initialize
666 * 863 *
667 * fontname == FONT_UP - switch to bigger font 864 * fontname == FONT_UP - switch to bigger font
668 * fontname == FONT_DN - switch to smaller font 865 * fontname == FONT_DN - switch to smaller font
669 */ 866 */
670/* EXTPROTO */ 867bool
671void
672rxvt_change_font(pR_ int init, const char *fontname) 868rxvt_term::change_font (const char *fontname)
673{ 869{
674} 870 if (fontname == FONT_UP)
871 {
872 // TODO
873 }
874 else if (fontname == FONT_DN)
875 {
876 // TODO
877 }
878 else
879 {
880 rxvt_fontset *fs = new rxvt_fontset (this);
675 881
676/* INTPROTO */ 882 if (fs && fs->populate (fontname ? fontname : "fixed"))
677void 883 {
884 delete TermWin.fontset;
885 TermWin.fontset = fs;
886 TermWin.fwidth = fs->base_font ()->width;
887 TermWin.fheight = fs->base_font ()->height;
888 TermWin.fbase = fs->base_font ()->ascent;
889
890 if (TermWin.parent[0])
891 {
892 resize_all_windows (0, 0, 0);
893 scr_remap_chars ();
894 scr_touch (true);
895 }
896
897 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
898 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
899
900 return true;
901 }
902 }
903
904 return false;
905}
906
907bool
678rxvt_font_up_down(pR_ int n, int direction) 908rxvt_term::font_up_down (int n, int direction)
679{ 909{
910 return false;
680} 911}
681 912
682/*----------------------------------------------------------------------*/ 913/*----------------------------------------------------------------------*/
683/*----------------------------------------------------------------------*/ 914/*----------------------------------------------------------------------*/
684/* xterm sequences - title, iconName, color (exptl) */ 915/* xterm sequences - title, iconName, color (exptl) */
685/* EXTPROTO */
686void 916void
687rxvt_set_title(pR_ const char *str) 917rxvt_term::set_title (const char *str)
688{ 918{
689#ifndef SMART_WINDOW_TITLE 919#ifdef SMART_WINDOW_TITLE
920 char *name;
921
922 if (!XFetchName (display->display, TermWin.parent[0], &name))
923 name = NULL;
924
925 if (name == NULL || STRCMP (name, str))
926#endif
690 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 927 XStoreName (display->display, TermWin.parent[0], str);
928
929#ifdef SMART_WINDOW_TITLE
930 if (name)
931 XFree (name);
932#endif
933}
934
935void
936rxvt_term::set_icon_name (const char *str)
937{
938#ifdef SMART_WINDOW_TITLE
939 char *name;
940
941 if (!XGetIconName (display->display, TermWin.parent[0], &name))
942 name = NULL;
943
944 if (name == NULL || STRCMP (name, str))
945#endif
946 XSetIconName (display->display, TermWin.parent[0], str);
947
948#ifdef SMART_WINDOW_TITLE
949 if (name)
950 XFree (name);
951#endif
952}
953
954#ifdef XTERM_COLOR_CHANGE
955void
956rxvt_term::set_window_color (int idx, const char *color)
957{
958 rxvt_color xcol;
959 int i;
960
961 if (color == NULL || *color == '\0')
962 return;
963
964 /* handle color aliases */
965 if (isdigit (*color))
966 {
967 i = atoi (color);
968 if (i >= 8 && i <= 15)
969 { /* bright colors */
970 i -= 8;
971# ifndef NO_BRIGHTCOLOR
972 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
973 SET_PIXCOLOR (idx);
974 goto Done;
975# endif
976
977 }
978 if (i >= 0 && i <= 7)
979 { /* normal colors */
980 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
981 SET_PIXCOLOR (idx);
982 goto Done;
983 }
984 }
985
986 if (!rXParseAllocColor (& xcol, color))
987 return;
988
989 /* XStoreColor (display->display, display->cmap, XColor*); */
990
991 /*
992 * FIXME: should free colors here, but no idea how to do it so instead,
993 * so just keep gobbling up the colormap
994 */
995# if 0
996 for (i = Color_Black; i <= Color_White; i++)
997 if (PixColors[idx] == PixColors[i])
998 break;
999 if (i > Color_White)
1000 {
1001 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
1002 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
1003 DisplayPlanes (display->display, display->screen));
1004 }
1005# endif
1006
1007 PixColorsFocused[idx] = xcol;
1008 SET_PIXCOLOR (idx);
1009
1010 /* XSetWindowAttributes attr; */
1011 /* Cursor cursor; */
1012Done:
1013#ifdef OFF_FOCUS_FADING
1014 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1015#endif
1016 if (idx == Color_bg && ! (Options & Opt_transparent))
1017 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1018
1019 /* handle Color_BD, scrollbar background, etc. */
1020
1021 set_colorfgbg ();
1022 recolour_cursor ();
1023 scr_touch (true);
1024}
1025
691#else 1026#else
692 char *name;
693
694 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0)
695 name = NULL;
696 if (name == NULL || STRCMP(name, str))
697 XStoreName(R->Xdisplay, R->TermWin.parent[0], str);
698 if (name)
699 XFree(name);
700#endif
701}
702
703/* EXTPROTO */
704void
705rxvt_set_iconName(pR_ const char *str)
706{
707#ifndef SMART_WINDOW_TITLE
708 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
709#else
710 char *name;
711
712 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name))
713 name = NULL;
714 if (name == NULL || STRCMP(name, str))
715 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
716 if (name)
717 XFree(name);
718#endif
719}
720
721#ifdef XTERM_COLOR_CHANGE
722/* EXTPROTO */
723void
724rxvt_set_window_color(pR_ int idx, const char *color)
725{
726 rxvt_color xcol;
727 int i;
728
729 if (color == NULL || *color == '\0')
730 return;
731
732/* handle color aliases */
733 if (isdigit(*color)) {
734 i = atoi(color);
735 if (i >= 8 && i <= 15) { /* bright colors */
736 i -= 8;
737# ifndef NO_BRIGHTCOLOR
738 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i];
739 SET_PIXCOLOR(R, idx);
740 goto Done;
741# endif
742 }
743 if (i >= 0 && i <= 7) { /* normal colors */
744 R->PixColors[idx] = R->PixColors[minCOLOR + i];
745 SET_PIXCOLOR(R, idx);
746 goto Done;
747 }
748 }
749 if (!rxvt_rXParseAllocColor(aR_ & xcol, color))
750 return;
751/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */
752
753/*
754 * FIXME: should free colors here, but no idea how to do it so instead,
755 * so just keep gobbling up the colormap
756 */
757# if 0
758 for (i = Color_Black; i <= Color_White; i++)
759 if (R->PixColors[idx] == R->PixColors[i])
760 break;
761 if (i > Color_White) {
762 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */
763 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1,
764 DisplayPlanes(R->Xdisplay, Xscreen));
765 }
766# endif
767
768 R->PixColors[idx] = xcol;
769 SET_PIXCOLOR(R, idx);
770
771/* XSetWindowAttributes attr; */
772/* Cursor cursor; */
773 Done:
774 if (idx == Color_bg && !(R->Options & Opt_transparent))
775 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
776 R->PixColors[Color_bg]);
777
778/* handle Color_BD, scrollbar background, etc. */
779
780 rxvt_set_colorfgbg (aR);
781 R->recolour_cursor ();
782/* the only reasonable way to enforce a clean update */
783 rxvt_scr_poweron (aR);
784}
785
786#else
787# define rxvt_set_window_color(aR_ idx,color) ((void)0) 1027# define set_window_color (idx,color) ((void)0)
788#endif /* XTERM_COLOR_CHANGE */ 1028#endif /* XTERM_COLOR_CHANGE */
789 1029
790void 1030void
791rxvt_term::recolour_cursor () 1031rxvt_term::recolour_cursor ()
792{ 1032{
793#if TODO
794 rxvt_color xcol[2]; 1033 XColor xcol[2];
795 1034
796 xcol[0] = PixColors[Color_pointer]; 1035 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
797 xcol[1] = PixColors[Color_bg]; 1036 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
798 XQueryColors (Xdisplay, XCMAP, xcol, 2); 1037 XQueryColors (display->display, display->cmap, xcol, 2);
799 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 1038 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
800#endif
801} 1039}
802 1040
803/*----------------------------------------------------------------------*/ 1041/*----------------------------------------------------------------------*/
804/* 1042/*
805 * find if fg/bg matches any of the normal (low-intensity) colors 1043 * find if fg/bg matches any of the normal (low-intensity) colors
806 */ 1044 */
807/* INTPROTO */
808void 1045void
809rxvt_set_colorfgbg(pR) 1046rxvt_term::set_colorfgbg ()
810{ 1047{
811 unsigned int i; 1048 unsigned int i;
812 const char *xpmb = "\0"; 1049 const char *xpmb = "\0";
813 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1050 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
814 1051
815 R->env_colorfgbg = 1052 env_colorfgbg =
816 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1053 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
817 STRCPY(fstr, "default"); 1054 STRCPY (fstr, "default");
818 STRCPY(bstr, "default"); 1055 STRCPY (bstr, "default");
819 for (i = Color_Black; i <= Color_White; i++) 1056 for (i = Color_Black; i <= Color_White; i++)
820 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1057 if (PixColors[Color_fg] == PixColors[i])
1058 {
821 sprintf(fstr, "%d", (i - Color_Black)); 1059 sprintf (fstr, "%d", (i - Color_Black));
822 break; 1060 break;
823 } 1061 }
824 for (i = Color_Black; i <= Color_White; i++) 1062 for (i = Color_Black; i <= Color_White; i++)
825 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1063 if (PixColors[Color_bg] == PixColors[i])
1064 {
826 sprintf(bstr, "%d", (i - Color_Black)); 1065 sprintf (bstr, "%d", (i - Color_Black));
827#ifdef XPM_BACKGROUND 1066#ifdef XPM_BACKGROUND
828 xpmb = "default;"; 1067 xpmb = "default;";
829#endif 1068#endif
830 break; 1069 break;
831 } 1070 }
1071
832 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1072 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
833 putenv(R->env_colorfgbg);
834 1073
835#ifndef NO_BRIGHTCOLOR 1074#ifndef NO_BRIGHTCOLOR
836 R->colorfgbg = DEFAULT_RSTYLE; 1075 colorfgbg = DEFAULT_RSTYLE;
837 for (i = minCOLOR; i <= maxCOLOR; i++) { 1076 for (i = minCOLOR; i <= maxCOLOR; i++)
1077 {
838 if (R->PixColors[Color_fg] == R->PixColors[i]) 1078 if (PixColors[Color_fg] == PixColors[i])
839 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 1079 colorfgbg = SET_FGCOLOR (colorfgbg, i);
840 if (R->PixColors[Color_bg] == R->PixColors[i]) 1080 if (PixColors[Color_bg] == PixColors[i])
841 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 1081 colorfgbg = SET_BGCOLOR (colorfgbg, i);
842 } 1082 }
843#endif 1083#endif
844} 1084}
845 1085
846/*----------------------------------------------------------------------*/ 1086/*----------------------------------------------------------------------*/
847/* 1087/*
848 * Colour determination for low colour displays, routine from 1088 * Colour determination for low colour displays, routine from
849 * Hans de Goede <hans@highrise.nl> 1089 * Hans de Goede <hans@highrise.nl>
850 */ 1090 */
851 1091
852/* EXTPROTO */
853int 1092int
854rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1093rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
855{ 1094{
856 screen_in_out->set(aR_ colour);
857
858 if (!screen_in_out->set(aR_ colour)) { 1095 if (!screen_in_out->set (display, colour))
859 rxvt_print_error("can't allocate colour: %s", colour); 1096 {
1097 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
860 return false; 1098 return false;
861 } 1099 }
862 1100
863 return true; 1101 return true;
864} 1102}
865 1103
866/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
867 * - WINDOW RESIZING - * 1105 * - WINDOW RESIZING - *
868 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
869/* EXTPROTO */
870void 1107void
871rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1108rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
872 int ignoreparent)
873{ 1109{
874 int fix_screen; 1110 int fix_screen;
875 1111
876#ifdef SMART_RESIZE 1112#ifdef SMART_RESIZE
877 int old_width = R->szHint.width, old_height = R->szHint.height; 1113 int old_width = szHint.width, old_height = szHint.height;
878#endif 1114#endif
879 1115
880 rxvt_window_calc(aR_ width, height); 1116 window_calc (width, height);
881 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1117 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1118
882 if (!ignoreparent) { 1119 if (!ignoreparent)
1120 {
883#ifdef SMART_RESIZE 1121#ifdef SMART_RESIZE
884/* 1122 /*
885 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1123 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
886 * reposition window on resize depending on placement on screen 1124 * reposition window on resize depending on placement on screen
887 */ 1125 */
888 int x, y, x1, y1; 1126 int x, y, x1, y1;
889 int dx, dy; 1127 int dx, dy;
890 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1128 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
891 Window unused_cr; 1129 Window unused_cr;
892 1130
893 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1131 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
894 0, 0, &x, &y, &unused_cr); 1132 0, 0, &x, &y, &unused_cr);
895 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1133 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
896 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1134 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
897 /* 1135 /*
898 * if Xroot isn't the parent window, a WM will probably have offset 1136 * if display->root isn't the parent window, a WM will probably have offset
899 * our position for handles and decorations. Counter it 1137 * our position for handles and decorations. Counter it
900 */ 1138 */
901 if (x1 != x || y1 != y) { 1139 if (x1 != x || y1 != y)
1140 {
902 x -= x1; 1141 x -= x1;
903 y -= y1; 1142 y -= y1;
904 } 1143 }
905 1144
906 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1145 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
907 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1146 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
908 dx = old_width - R->szHint.width; 1147 dx = old_width - szHint.width;
909 dy = old_height - R->szHint.height; 1148 dy = old_height - szHint.height;
910 1149
911 /* Check position of the center of the window */ 1150 /* Check position of the center of the window */
912 if (x < x1) /* left half */ 1151 if (x < x1) /* left half */
913 dx = 0; 1152 dx = 0;
914 else if (x == x1) /* exact center */ 1153 else if (x == x1) /* exact center */
915 dx /= 2; 1154 dx /= 2;
916 if (y < y1) /* top half */ 1155 if (y < y1) /* top half */
917 dy = 0; 1156 dy = 0;
918 else if (y == y1) /* exact center */ 1157 else if (y == y1) /* exact center */
919 dy /= 2; 1158 dy /= 2;
920 1159
921 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1160 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
922 R->szHint.width, R->szHint.height); 1161 szHint.width, szHint.height);
923#else 1162#else
924 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1163 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
925 R->szHint.height);
926#endif 1164#endif
927 } 1165 }
928 1166
929 fix_screen = (R->TermWin.ncol != R->prev_ncol 1167 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
930 || R->TermWin.nrow != R->prev_nrow); 1168
931 if (fix_screen || width != R->old_width || height != R->old_height) { 1169 if (fix_screen || width != old_width || height != old_height)
1170 {
932 if (scrollbar_visible(R)) { 1171 if (scrollbar_visible ())
1172 {
933 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1173 XMoveResizeWindow (display->display, scrollBar.win,
1174 window_sb_x, 0,
934 0, scrollbar_TotalWidth(), R->szHint.height); 1175 scrollbar_TotalWidth (), szHint.height);
935 rxvt_Resize_scrollBar(aR); 1176 resize_scrollbar ();
936 } 1177 }
1178
937 if (menubar_visible(R)) 1179 if (menubar_visible ())
938 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1180 XMoveResizeWindow (display->display, menuBar.win,
1181 window_vt_x, 0,
939 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1182 TermWin_TotalWidth (), menuBar_TotalHeight ());
940 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1183
941 R->window_vt_y, TermWin_TotalWidth(), 1184 XMoveResizeWindow (display->display, TermWin.vt,
1185 window_vt_x, window_vt_y,
942 TermWin_TotalHeight()); 1186 TermWin_TotalWidth (), TermWin_TotalHeight ());
943#ifdef RXVT_GRAPHICS
944 if (R->old_height)
945 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
946 R->old_height - R->szHint.base_height);
947#endif
948 rxvt_scr_clear(aR); 1187 scr_clear ();
949#ifdef XPM_BACKGROUND 1188#ifdef XPM_BACKGROUND
950 rxvt_resize_pixmap(aR); 1189 resize_pixmap ();
951#endif 1190#endif
952 } 1191 }
953 1192
954 if (fix_screen || R->old_height == 0) { 1193 if (fix_screen || old_height == 0)
1194 {
955 int curr_screen = -1; 1195 int curr_screen = -1;
956 uint16_t old_ncol = R->prev_ncol; 1196 int old_ncol = prev_ncol;
957 1197
958 /* scr_reset only works on the primary screen */ 1198 /* scr_reset only works on the primary screen */
959 if (R->old_height) /* this is not the first time through */ 1199 if (old_height) /* this is not the first time through */
1200 {
1201 unsigned int ncol = TermWin.ncol;
1202 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
960 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1203 curr_screen = scr_change_screen (PRIMARY);
961 1204 TermWin.ncol = ncol;
962 R->scr_reset();
963
964 if (curr_screen >= 0) { /* this is not the first time through */
965 rxvt_scr_change_screen(aR_ curr_screen);
966 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
967 } 1205 }
968 }
969 1206
1207 scr_reset ();
1208
1209 if (curr_screen >= 0) /* this is not the first time through */
1210 {
1211 scr_change_screen (curr_screen);
1212 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1213 }
1214 }
1215
970 R->old_width = R->szHint.width; 1216 old_width = szHint.width;
971 R->old_height = R->szHint.height; 1217 old_height = szHint.height;
972 1218
973#ifdef USE_XIM 1219#ifdef USE_XIM
974 rxvt_IMSetStatusPosition(aR); 1220 IMSetStatusPosition ();
975#endif 1221#endif
976} 1222}
977 1223
978/* 1224/*
979 * Set the width/height of the vt window in characters. Units are pixels. 1225 * Set the width/height of the vt window in characters. Units are pixels.
980 * good for toggling 80/132 columns 1226 * good for toggling 80/132 columns
981 */ 1227 */
982/* EXTPROTO */
983void 1228void
984rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1229rxvt_term::set_widthheight (unsigned int width, unsigned int height)
985{ 1230{
986 XWindowAttributes wattr; 1231 XWindowAttributes wattr;
987 1232
988 if (width == 0 || height == 0) { 1233 if (width == 0 || height == 0)
1234 {
989 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1235 XGetWindowAttributes (display->display, display->root, &wattr);
990 if (width == 0) 1236 if (width == 0)
991 width = wattr.width - R->szHint.base_width; 1237 width = wattr.width - szHint.base_width;
992 if (height == 0) 1238 if (height == 0)
993 height = wattr.height - R->szHint.base_height; 1239 height = wattr.height - szHint.base_height;
994 } 1240 }
995 if (width != R->TermWin.width || height != R->TermWin.height) { 1241 if (width != TermWin.width || height != TermWin.height)
1242 {
996 width += R->szHint.base_width; 1243 width += szHint.base_width;
997 height += R->szHint.base_height; 1244 height += szHint.base_height;
998 rxvt_resize_all_windows(aR_ width, height, 0); 1245 resize_all_windows (width, height, 0);
999 } 1246 }
1000} 1247}
1001 1248
1002/* -------------------------------------------------------------------- * 1249/* -------------------------------------------------------------------- *
1003 * - X INPUT METHOD ROUTINES - * 1250 * - X INPUT METHOD ROUTINES - *
1004 * -------------------------------------------------------------------- */ 1251 * -------------------------------------------------------------------- */
1005#ifdef USE_XIM 1252#ifdef USE_XIM
1006/* INTPROTO */ 1253
1007void 1254void
1008rxvt_setSize(pR_ XRectangle * size) 1255rxvt_term::im_set_size (XRectangle *size)
1009{ 1256{
1010 size->x = R->TermWin.int_bwidth; 1257 size->x = TermWin.int_bwidth;
1011 size->y = R->TermWin.int_bwidth; 1258 size->y = TermWin.int_bwidth;
1012 size->width = Width2Pixel(R->TermWin.ncol); 1259 size->width = Width2Pixel (TermWin.ncol);
1013 size->height = Height2Pixel(R->TermWin.nrow); 1260 size->height = Height2Pixel (TermWin.nrow);
1014} 1261}
1015 1262
1016/* INTPROTO */
1017void 1263void
1018rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1264rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1019{ 1265{
1020 *fg = R->PixColors[Color_fg]; 1266 *fg = PixColors[Color_fg];
1021 *bg = R->PixColors[Color_bg]; 1267 *bg = PixColors[Color_bg];
1022} 1268}
1023 1269
1024/* Checking whether input method is running. */ 1270/* Checking whether input method is running. */
1025/* INTPROTO */
1026Bool 1271bool
1027rxvt_IMisRunning(pR) 1272rxvt_term::IMisRunning ()
1028{ 1273{
1029 char *p; 1274 char *p;
1030 Atom atom; 1275 Atom atom;
1031 Window win; 1276 Window win;
1032 char server[IMBUFSIZ]; 1277 char server[IMBUFSIZ];
1033 1278
1034/* get current locale modifier */ 1279 /* get current locale modifier */
1035 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1280 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1281 {
1036 STRCPY(server, "@server="); 1282 STRCPY (server, "@server=");
1037 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1283 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1038 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1284 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1039 *p = '\0'; 1285 *p = '\0';
1040 1286
1041 atom = XInternAtom(R->Xdisplay, server, False); 1287 atom = XInternAtom (display->display, server, False);
1042 win = XGetSelectionOwner(R->Xdisplay, atom); 1288 win = XGetSelectionOwner (display->display, atom);
1043 if (win != None) 1289 if (win != None)
1044 return True; 1290 return True;
1045 } 1291 }
1046 return False; 1292 return False;
1047} 1293}
1048 1294
1049/* EXTPROTO */
1050void 1295void
1051rxvt_IMSendSpot(pR) 1296rxvt_term::IMSendSpot ()
1052{ 1297{
1053 XPoint spot; 1298 XPoint spot;
1054 XVaNestedList preedit_attr; 1299 XVaNestedList preedit_attr;
1055 1300
1056 if (R->Input_Context == NULL 1301 if (Input_Context == NULL
1057 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1302 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1058 || !(R->event_type == KeyPress 1303 || ! (event_type == KeyPress
1059 || R->event_type == Expose 1304 || event_type == Expose
1060 || R->event_type == NoExpose 1305 || event_type == NoExpose
1061 || R->event_type == SelectionNotify 1306 || event_type == SelectionNotify
1062 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1307 || event_type == ButtonRelease || event_type == FocusIn)
1063 || !rxvt_IMisRunning(aR)) 1308 || !IMisRunning ())
1064 return; 1309 return;
1065 1310
1066 rxvt_setPosition(aR_ & spot); 1311 im_set_position (&spot);
1067 1312
1068 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1313 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1069 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1314 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1070 XFree(preedit_attr); 1315 XFree (preedit_attr);
1071} 1316}
1072 1317
1073/* INTPROTO */
1074void 1318void
1075rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1319rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1076 XRectangle * needed_rect) 1320 XRectangle * needed_rect)
1077{ 1321{
1078 int mbh, vtx = 0; 1322 int mbh, vtx = 0;
1079 1323
1080 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1324 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1081 vtx = scrollbar_TotalWidth(); 1325 vtx = scrollbar_TotalWidth ();
1326
1082 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1327 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1083 mbh -= R->TermWin.lineSpace; 1328 mbh -= TermWin.lineSpace;
1084 1329
1085 preedit_rect->x = needed_rect->width + vtx; 1330 preedit_rect->x = needed_rect->width + vtx;
1086 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1331 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1087 1332
1088 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1333 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1089 + vtx;
1090 preedit_rect->height = Height2Pixel(1); 1334 preedit_rect->height = Height2Pixel (1);
1091 1335
1092 status_rect->x = vtx; 1336 status_rect->x = vtx;
1093 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1337 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1094 1338
1095 status_rect->width = needed_rect->width ? needed_rect->width 1339 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1096 : Width2Pixel(R->TermWin.ncol + 1);
1097 status_rect->height = Height2Pixel(1); 1340 status_rect->height = Height2Pixel (1);
1098} 1341}
1099 1342
1100/* ARGSUSED */
1101/* INTPROTO */
1102void 1343void
1103rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1344rxvt_term::im_destroy ()
1104 __attribute__ ((unused)), XPointer call_data
1105 __attribute__ ((unused)))
1106{ 1345{
1107 dR; 1346 if (Input_Context)
1108 1347 {
1348 XDestroyIC (Input_Context);
1109 R->Input_Context = NULL; 1349 Input_Context = NULL;
1110/* To avoid Segmentation Fault in C locale: Solaris only? */ 1350 }
1111 if (STRCMP(R->locale, "C")) 1351
1112 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1352 if (input_method)
1113 rxvt_IMInstantiateCallback, NULL); 1353 {
1354 display->put_xim (input_method);
1355 input_method = 0;
1356 }
1114} 1357}
1115 1358
1116/* 1359/*
1117 * Try to open a XIM with the current modifiers, then see if we can 1360 * Try to open a XIM with the current modifiers, then see if we can
1118 * open a suitable preedit type 1361 * open a suitable preedit type
1119 */ 1362 */
1120static Bool 1363bool
1121rxvt_IM_get_IC (pR) 1364rxvt_term::IM_get_IC (const char *modifiers)
1122{ 1365{
1123 int i, j, found; 1366 int i, j, found;
1124 XIM xim; 1367 XIM xim;
1125 XPoint spot; 1368 XPoint spot;
1126 XRectangle rect, status_rect, needed_rect; 1369 XRectangle rect, status_rect, needed_rect;
1127 unsigned long fg, bg; 1370 unsigned long fg, bg;
1128 const char *p; 1371 const char *p;
1129 char **s; 1372 char **s;
1130 XIMStyles *xim_styles; 1373 XIMStyles *xim_styles;
1131 XVaNestedList preedit_attr, status_attr; 1374 XVaNestedList preedit_attr, status_attr;
1132 XIMCallback ximcallback;
1133 1375
1376 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1377 return false;
1378
1134 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1379 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1135 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); 1380 input_method = display->get_xim (locale, modifiers);
1136 if (xim == NULL) 1381 if (input_method == NULL)
1137 return False; 1382 return false;
1138 1383
1384 xim = input_method->xim;
1385
1139 xim_styles = NULL; 1386 xim_styles = NULL;
1140 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1387 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1141 || !xim_styles || !xim_styles->count_styles) { 1388 || !xim_styles || !xim_styles->count_styles)
1142 XCloseIM(xim); 1389 {
1390 display->put_xim (input_method);
1143 return False; 1391 return false;
1144 } 1392 }
1145 1393
1146 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1394 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1147 : "OverTheSpot,OffTheSpot,Root";
1148 s = rxvt_splitcommastring(p); 1395 s = rxvt_splitcommastring (p);
1149 for (i = found = 0; !found && s[i]; i++) { 1396 for (i = found = 0; !found && s[i]; i++)
1397 {
1150 if (!STRCMP(s[i], "OverTheSpot")) 1398 if (!STRCMP (s[i], "OverTheSpot"))
1151 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1399 input_style = (XIMPreeditPosition | XIMStatusNothing);
1152 else if (!STRCMP(s[i], "OffTheSpot")) 1400 else if (!STRCMP (s[i], "OffTheSpot"))
1153 R->input_style = (XIMPreeditArea | XIMStatusArea); 1401 input_style = (XIMPreeditArea | XIMStatusArea);
1154 else if (!STRCMP(s[i], "Root")) 1402 else if (!STRCMP (s[i], "Root"))
1155 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1403 input_style = (XIMPreeditNothing | XIMStatusNothing);
1156 1404
1157 for (j = 0; j < xim_styles->count_styles; j++) 1405 for (j = 0; j < xim_styles->count_styles; j++)
1158 if (R->input_style == xim_styles->supported_styles[j]) { 1406 if (input_style == xim_styles->supported_styles[j])
1407 {
1159 found = 1; 1408 found = 1;
1160 break; 1409 break;
1161 } 1410 }
1162 } 1411 }
1412
1163 for (i = 0; s[i]; i++) 1413 for (i = 0; s[i]; i++)
1164 free(s[i]); 1414 free (s[i]);
1415
1165 free(s); 1416 free (s);
1166 XFree(xim_styles); 1417 XFree (xim_styles);
1167 1418
1168 if (!found) { 1419 if (!found)
1169 XCloseIM(xim); 1420 {
1421 display->put_xim (input_method);
1170 return False; 1422 return false;
1171 } 1423 }
1172 1424
1173 ximcallback.callback = rxvt_IMDestroyCallback;
1174
1175 /* XXX: not sure why we need this (as well as IC one below) */
1176 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1177
1178 preedit_attr = status_attr = NULL; 1425 preedit_attr = status_attr = NULL;
1179 1426
1180 if (R->input_style & XIMPreeditPosition) { 1427 if (input_style & XIMPreeditPosition)
1181 rxvt_setSize(aR_ & rect); 1428 {
1182 rxvt_setPosition(aR_ & spot); 1429 im_set_size (&rect);
1183 rxvt_setColor(aR_ & fg, &bg); 1430 im_set_position (&spot);
1431 im_set_color (&fg, &bg);
1184 1432
1185 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1433 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1186 XNSpotLocation, &spot, 1434 XNSpotLocation, &spot,
1187 XNForeground, fg, XNBackground, bg,
1188 //XNFontSet, R->TermWin.fontset,
1189 NULL);
1190 } else if (R->input_style & XIMPreeditArea) {
1191 rxvt_setColor(aR_ & fg, &bg);
1192
1193 /*
1194 * The necessary width of preedit area is unknown
1195 * until create input context.
1196 */
1197 needed_rect.width = 0;
1198
1199 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1200
1201 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1202 XNForeground, fg, XNBackground, bg,
1203 //XNFontSet, R->TermWin.fontset,
1204 NULL);
1205 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1206 XNForeground, fg, XNBackground, bg, 1435 XNForeground, fg, XNBackground, bg,
1207 //XNFontSet, R->TermWin.fontset, 1436 //XNFontSet, TermWin.fontset,
1208 NULL); 1437 NULL);
1438 }
1439 else if (input_style & XIMPreeditArea)
1209 } 1440 {
1441 im_set_color (&fg, &bg);
1442
1443 /*
1444 * The necessary width of preedit area is unknown
1445 * until create input context.
1446 */
1447 needed_rect.width = 0;
1448
1449 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1450
1451 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1452 XNForeground, fg, XNBackground, bg,
1453 //XNFontSet, TermWin.fontset,
1454 NULL);
1455 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1456 XNForeground, fg, XNBackground, bg,
1457 //XNFontSet, TermWin.fontset,
1458 NULL);
1459 }
1460
1210 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1461 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1211 XNClientWindow, R->TermWin.parent[0], 1462 XNClientWindow, TermWin.parent[0],
1212 XNFocusWindow, R->TermWin.parent[0], 1463 XNFocusWindow, TermWin.parent[0],
1213 XNDestroyCallback, &ximcallback,
1214 preedit_attr ? XNPreeditAttributes : NULL, 1464 preedit_attr ? XNPreeditAttributes : NULL,
1215 preedit_attr, 1465 preedit_attr,
1216 status_attr ? XNStatusAttributes : NULL, 1466 status_attr ? XNStatusAttributes : NULL,
1217 status_attr, NULL); 1467 status_attr, NULL);
1218 if (preedit_attr) 1468 if (preedit_attr) XFree (preedit_attr);
1219 XFree(preedit_attr); 1469 if (status_attr) XFree (status_attr);
1220 if (status_attr) 1470
1221 XFree(status_attr);
1222 if (R->Input_Context == NULL) { 1471 if (Input_Context == NULL)
1223 rxvt_print_error("failed to create input context"); 1472 {
1224 XCloseIM(xim); 1473 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1474 display->put_xim (input_method);
1225 return False; 1475 return false;
1226 } 1476 }
1477
1227 if (R->input_style & XIMPreeditArea) 1478 if (input_style & XIMPreeditArea)
1228 rxvt_IMSetStatusPosition(aR); 1479 IMSetStatusPosition ();
1480
1229 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1481 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1230 return True; 1482 return true;
1231} 1483}
1232 1484
1233/*
1234 * X manual pages and include files don't match on some systems:
1235 * some think this is an XIDProc and others an XIMProc so we can't
1236 * use the first argument - need to update this to be nice for
1237 * both types via some sort of configure detection
1238 */
1239/* ARGSUSED */
1240/* EXTPROTO */
1241void 1485void
1242rxvt_IMInstantiateCallback(Display * unused 1486rxvt_term::im_cb ()
1243 __attribute__ ((unused)), XPointer client_data
1244 __attribute__ ((unused)), XPointer call_data
1245 __attribute__ ((unused)))
1246{ 1487{
1247 dR;
1248 int i, found, had_im; 1488 int i, found, had_im;
1249 const char *p; 1489 const char *p;
1250 char **s; 1490 char **s;
1251 char buf[IMBUFSIZ]; 1491 char buf[IMBUFSIZ];
1252 1492
1493 im_destroy ();
1494
1253 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1495 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1254 if (R->Input_Context) 1496 if (Input_Context)
1255 return; 1497 return;
1256 1498
1257#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1499#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1258 if (R->rs[Rs_imLocale]) 1500 if (rs[Rs_imLocale])
1259 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1501 SET_LOCALE (rs[Rs_imLocale]);
1260#endif 1502#endif
1261 1503
1262 p = R->rs[Rs_inputMethod]; 1504 p = rs[Rs_inputMethod];
1263 if (p && *p) 1505 if (p && *p)
1264 { 1506 {
1265 bool found = false; 1507 bool found = false;
1266 1508
1267 s = rxvt_splitcommastring (p); 1509 s = rxvt_splitcommastring (p);
1269 { 1511 {
1270 if (*s[i]) 1512 if (*s[i])
1271 { 1513 {
1272 STRCPY (buf, "@im="); 1514 STRCPY (buf, "@im=");
1273 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1515 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1274 if ((p = XSetLocaleModifiers (buf)) && *p 1516 if (IM_get_IC (buf))
1275 && rxvt_IM_get_IC (aR))
1276 { 1517 {
1277 found = true; 1518 found = true;
1278 break; 1519 break;
1279 } 1520 }
1280 } 1521 }
1281 } 1522 }
1282 for (i = 0; s[i]; i++) 1523 for (i = 0; s[i]; i++)
1283 free(s[i]); 1524 free (s[i]);
1284 free(s); 1525 free (s);
1285 1526
1286 if (found) 1527 if (found)
1287 goto done; 1528 goto done;
1288 } 1529 }
1289 1530
1290/* try with XMODIFIERS env. var. */ 1531 /* try with XMODIFIERS env. var. */
1291 if ((p = XSetLocaleModifiers ("")) && *p 1532 if (IM_get_IC (""))
1292 && rxvt_IM_get_IC (aR))
1293 goto done; 1533 goto done;
1294 1534
1295/* try with no modifiers base IF the user didn't specify an IM */ 1535 /* try with no modifiers base IF the user didn't specify an IM */
1296 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1536 if (IM_get_IC ("@im=none"))
1297 && rxvt_IM_get_IC (aR) == True)
1298 goto done; 1537 goto done;
1299 1538
1300done: 1539done:
1301#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1540#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1302 if (R->rs[Rs_imLocale]) 1541 if (rs[Rs_imLocale])
1303 setlocale (LC_CTYPE, R->locale); 1542 SET_LOCALE (locale);
1304#endif 1543#endif
1305} 1544}
1306 1545
1307/* EXTPROTO */
1308void 1546void
1309rxvt_IMSetStatusPosition(pR) 1547rxvt_term::IMSetStatusPosition ()
1310{ 1548{
1311 XRectangle preedit_rect, status_rect, *needed_rect; 1549 XRectangle preedit_rect, status_rect, *needed_rect;
1312 XVaNestedList preedit_attr, status_attr; 1550 XVaNestedList preedit_attr, status_attr;
1313 1551
1314 if (R->Input_Context == NULL 1552 if (Input_Context == NULL
1315 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1553 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1316 || !rxvt_IMisRunning(aR)) 1554 || !IMisRunning ())
1317 return; 1555 return;
1318 1556
1319/* Getting the necessary width of preedit area */ 1557 /* Getting the necessary width of preedit area */
1320 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1558 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1321 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1559 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1322 XFree(status_attr); 1560 XFree (status_attr);
1323 1561
1324 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1562 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1325 1563
1326 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1564 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1327 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1565 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1328 1566
1329 XSetICValues(R->Input_Context, 1567 XSetICValues (Input_Context,
1330 XNPreeditAttributes, preedit_attr, 1568 XNPreeditAttributes, preedit_attr,
1331 XNStatusAttributes, status_attr, NULL); 1569 XNStatusAttributes, status_attr, NULL);
1332 1570
1333 XFree(preedit_attr); 1571 XFree (preedit_attr);
1334 XFree(status_attr); 1572 XFree (status_attr);
1335} 1573}
1336#endif /* USE_XIM */ 1574#endif /* USE_XIM */
1337 1575
1338/*----------------------------------------------------------------------*/ 1576/*----------------------------------------------------------------------*/
1339rxvt_t rxvt_current_term; 1577rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines