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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines