ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines