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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines