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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines