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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.73 by root, Fri Jul 30 14:59:12 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines