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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines