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.12 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.80 by root, Fri Aug 13 19:31:23 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines