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.19 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines