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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.285 by root, Fri Dec 14 06:32:38 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2007 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM 186#ifndef NO_BELL
173 im_ev (this, &rxvt_term::im_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
174#endif 188#endif
175 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
176 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
177 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
178 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
179 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
180 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
181 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
182 incr_ev (this, &rxvt_term::incr_cb) 196
183{
184 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
185 198
186 termlist.push_back (this); 199 termlist.push_back (this);
187 200
188#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
190#endif 203#endif
191} 204}
192 205
193// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 207// for use before an emergency exit
208void
195void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
196{ 210{
197 if (cmd_pid) 211 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
199 213
214 pty_ev.stop ();
200 delete pty; pty = 0; 215 delete pty; pty = 0;
201} 216}
202 217
203rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
204{ 219{
… …
213#endif 228#endif
214 delete fontset[0]; 229 delete fontset[0];
215 230
216 if (display) 231 if (display)
217 { 232 {
218 dDisp;
219
220 selection_clear (); 233 selection_clear ();
221 234
222#ifdef USE_XIM 235#ifdef USE_XIM
223 im_destroy (); 236 im_destroy ();
224#endif 237#endif
225#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 241#endif
229#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 244#endif
232#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 256#endif
244#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 261#endif
249 if (gc) XFreeGC (disp, gc); 262 if (gc) XFreeGC (dpy, gc);
250 263
251 delete drawable; 264 delete drawable;
252 // destroy all windows 265 // destroy all windows
253 if (parent[0]) 266 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
255 }
256 268
257 // TODO: free pixcolours, colours should become part of rxvt_display 269 for (int i = 0; i < TOTAL_COLORS; i++)
258 delete pix_colors_focused; 270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
259#if OFF_FOCUS_FADING 273#if OFF_FOCUS_FADING
274 pix_colors_unfocused [i].free (this);
275#endif
276 }
277
278 clear ();
279 }
280
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 283 delete [] pix_colors_unfocused;
261#endif 284#endif
262 285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
263 displays.put (display); 289 displays.put (display);
264 290
265 scr_release (); 291 scr_release ();
266 292
267 /* clear all resources */ 293 /* clear all resources */
268 for (int i = 0; i < allocated.size (); i++) 294 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 295 free (allocated [i]);
270 296
271 free (selection.text); 297 free (selection.text);
272 // TODO: manage env vars in child only(!) 298 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 299 free (env_display);
275 free (env_term); 300 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 301 free (locale);
278 free (v_buffer); 302 free (v_buffer);
279 free (incr_buf); 303 free (incr_buf);
280 304
281 delete envv; 305 delete envv;
282 delete argv; 306 delete argv;
283 307
284#ifdef KEYSYM_RESOURCE 308#ifdef KEYSYM_RESOURCE
285 delete keyboard; 309 delete keyboard;
286#endif 310#endif
311#ifndef NO_RESOURCES
312 XrmDestroyDatabase (option_db);
313#endif
287} 314}
288 315
289// child has exited, usually destroys 316// child has exited, usually destroys
290void 317void
291rxvt_term::child_cb (child_watcher &w, int status) 318rxvt_term::child_cb (ev::child &w, int status)
292{ 319{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 320 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294 321
295 cmd_pid = 0; 322 cmd_pid = 0;
296 323
297 if (!OPTION (Opt_hold)) 324 if (!option (Opt_hold))
298 destroy (); 325 destroy ();
299} 326}
300 327
301void 328void
302rxvt_term::destroy () 329rxvt_term::destroy ()
303{ 330{
304 if (destroy_ev.active) 331 if (destroy_ev.is_active ())
305 return; 332 return;
306 333
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 335
310#if ENABLE_OVERLAY 336#if ENABLE_OVERLAY
311 scr_overlay_off (); 337 scr_overlay_off ();
312#endif 338#endif
313 339
… …
317 im_ev.stop (display); 343 im_ev.stop (display);
318#endif 344#endif
319#if HAVE_SCROLLBARS 345#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 346 scrollbar_ev.stop (display);
321#endif 347#endif
322#if TRANSPARENT 348#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 349 rootwin_ev.stop (display);
324#endif 350#endif
325 incr_ev.stop (); 351 incr_ev.stop ();
326 termwin_ev.stop (display); 352 termwin_ev.stop (display);
327 vt_ev.stop (display); 353 vt_ev.stop (display);
328 } 354 }
329 355
330 check_ev.stop (); 356 flush_ev.stop ();
331 pty_ev.stop (); 357 pty_ev.stop ();
332#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
334#endif 360#endif
335#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
343#endif 369#endif
344#ifdef POINTER_BLANK 370#ifdef POINTER_BLANK
345 pointer_ev.stop (); 371 pointer_ev.stop ();
346#endif 372#endif
347 373
348 destroy_ev.start (0); 374 destroy_ev.start ();
349} 375}
350 376
351void 377void
352rxvt_term::destroy_cb (time_watcher &w) 378rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 379{
354 make_current (); 380 make_current ();
355 381
356 delete this; 382 delete this;
357} 383}
… …
368{ 394{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 395 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 396 (*t)->emergency_cleanup ();
371} 397}
372 398
373#if ENABLE_FRILLS 399#if !ENABLE_MINIMAL
374static void 400static void
375print_x_error (Display *dpy, XErrorEvent *event) 401print_x_error (Display *dpy, XErrorEvent *event)
376{ 402{
377 char buffer[BUFSIZ]; 403 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 404 char mesg[BUFSIZ];
… …
411 else 437 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 439 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 441 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 443 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 445}
420#endif 446#endif
421 447
… …
426 GET_R->allowedxerror = event->error_code; 452 GET_R->allowedxerror = event->error_code;
427 else 453 else
428 { 454 {
429 // GET_R is most likely not the terminal which caused the error, 455 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 456 // so just output the error and continue
431#if ENABLE_FRILLS 457#if ENABLE_MINIMAL
458 old_xerror_handler (display, event);
459#else
432 print_x_error (display, event); 460 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 461#endif
436 } 462 }
437 463
438 return 0; 464 return 0;
439} 465}
… …
446 rxvt_emergency_cleanup (); 472 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 473 _exit (EXIT_FAILURE);
448} 474}
449 475
450/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
451bool 477void
452rxvt_term::init (int argc, const char *const *argv) 478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 479{
480 this->envv = envv;
481
454 SET_R (this); 482 SET_R (this);
455 set_locale (""); 483 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 484 set_environ (envv); // few things in X do not call setlocale :(
457 485
458 if (!init_vars ()) 486 init_vars ();
459 return false;
460 487
461 init_secondary (); 488 init_secondary ();
462 489
463 const char **cmd_argv = init_resources (argc, argv); 490 const char **cmd_argv = init_resources (argc, argv);
464 491
465#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 493 keyboard->register_done ();
467#endif 494#endif
468 495
496#ifdef HAVE_SCROLLBARS
497 if (option (Opt_scrollBar))
498 scrollBar.setIdle (); /* set existence for size calculations */
499#endif
500
501 pty = ptytty::create ();
502
503 create_windows (argc, argv);
504
505 init_xlocale ();
506
507 scr_reset (); // initialize screen
508
509#if 0
510 XSynchronize (dpy, True);
511#endif
512
513#ifdef HAVE_SCROLLBARS
514 if (option (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */
516#endif
517#ifdef HAVE_BG_PIXMAP
518 {
519 bgPixmap.set_target (this);
520
521#ifdef ENABLE_TRANSPARENCY
522 if (option (Opt_transparent))
523 {
524 bgPixmap.set_transparent ();
525#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif
529 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL)
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != NULL)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
469#if ENABLE_PERL 561#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */
485#endif
486
487 pty = rxvt_new_ptytty ();
488
489 create_windows (argc, argv);
490
491 dDisp;
492
493 init_xlocale ();
494
495 scr_reset (); // initialize screen
496
497#if 0
498 XSynchronize (disp, True);
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */
504#endif
505#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent))
507 {
508 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents ();
510 rootwin_ev.start (display, display->root); 562 rootwin_ev.start (display, display->root);
511 }
512#endif 563#endif
513 564
514 set_colorfgbg (); 565 set_colorfgbg ();
515 566
516 init_command (cmd_argv); 567 init_command (cmd_argv);
517 568
518 free (cmd_argv); 569 free (cmd_argv);
519 570
520 if (pty->pty >= 0) 571 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ); 572 pty_ev.start (pty->pty, ev::READ);
522
523 check_ev.start ();
524 573
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
526 575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
527 XMapWindow (disp, vt); 586 XMapWindow (dpy, vt);
528 XMapWindow (disp, parent[0]); 587 XMapWindow (dpy, parent[0]);
529
530 return true;
531} 588}
532 589
533static struct sig_handlers 590static struct sig_handlers
534{ 591{
535 sig_watcher sw_term, sw_int; 592 ev::sig sw_term, sw_int;
536 593
537 /* 594 /*
538 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
539 */ 596 */
540 void 597 void sig_term (ev::sig &w, int revents);
541 sig_term (sig_watcher &w) 598
599 sig_handlers ()
542 { 600 {
543#ifdef DEBUG_CMD 601 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum);
549 }
550
551 sig_handlers ()
552 : sw_term (this, &sig_handlers::sig_term),
553 sw_int (this, &sig_handlers::sig_term) 602 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
554 {
555 } 603 }
556} sig_handlers; 604} sig_handlers;
557 605
606void
607sig_handlers::sig_term (ev::sig &w, int revents)
608{
609 rxvt_emergency_cleanup ();
610 w.stop ();
611 kill (getpid (), w.signum);
612}
613
558char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
559 615
560void 616void
561rxvt_init () 617rxvt_init ()
562{ 618{
563 uid_t uid = getuid (); 619 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576 620
577 // drop privileges 621 if (!ev_default_loop (0))
578#if HAVE_SETRESUID 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 623
594 rxvt_environ = environ; 624 rxvt_environ = environ;
595 625
596 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
598 628
599 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
600 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
601 631
602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
603 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
604 634
605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
645 return p; 675 return p;
646} 676}
647 677
648/*----------------------------------------------------------------------*/ 678/*----------------------------------------------------------------------*/
649/* 679/*
650 * window size/position calculcations for XSizeHint and other storage. 680 * window size/position calculations for XSizeHint and other storage.
651 * if width/height are non-zero then override calculated width/height 681 * if width/height are non-zero then override calculated width/height
652 */ 682 */
653void 683void
654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
655{ 685{
656 short recalc_x, recalc_y; 686 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 687 int x, y, sb_w, flags;
658 unsigned int w, h; 688 unsigned int w, h;
659 unsigned int max_width, max_height; 689 unsigned int max_width, max_height;
660 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 690
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 692 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 693 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 694
… …
730 756
731 if (scrollBar.state) 757 if (scrollBar.state)
732 { 758 {
733 sb_w = scrollbar_TotalWidth (); 759 sb_w = scrollbar_TotalWidth ();
734 szHint.base_width += sb_w; 760 szHint.base_width += sb_w;
761
735 if (!OPTION (Opt_scrollBar_right)) 762 if (!option (Opt_scrollBar_right))
736 window_vt_x += sb_w; 763 window_vt_x += sb_w;
737 } 764 }
738 765
739 szHint.width_inc = fwidth; 766 szHint.width_inc = fwidth;
740 szHint.height_inc = fheight; 767 szHint.height_inc = fheight;
741 szHint.min_width = szHint.base_width + szHint.width_inc; 768 szHint.min_width = szHint.base_width + szHint.width_inc;
742 szHint.min_height = szHint.base_height + szHint.height_inc; 769 szHint.min_height = szHint.base_height + szHint.height_inc;
743 770
744 if (newwidth && newwidth - szHint.base_width < max_width) 771 if (newwidth && newwidth - szHint.base_width < max_width)
745 { 772 {
746 szHint.width = newwidth; 773 szHint.width = newwidth;
… …
761 { 788 {
762 min_it (height, max_height); 789 min_it (height, max_height);
763 szHint.height = szHint.base_height + height; 790 szHint.height = szHint.base_height + height;
764 } 791 }
765 792
766 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 793 if (scrollBar.state && option (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w; 794 window_sb_x = szHint.width - sb_w;
768 795
769 if (recalc_x) 796 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798
771 if (recalc_y) 799 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 800 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
773 801
774 ncol = width / fwidth; 802 ncol = width / fwidth;
775 nrow = height / fheight; 803 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 804}
781 805
782/*----------------------------------------------------------------------*/ 806/*----------------------------------------------------------------------*/
783/* 807/*
784 * Tell the teletype handler what size the window is. 808 * Tell the teletype handler what size the window is.
… …
797 ws.ws_xpixel = width; 821 ws.ws_xpixel = width;
798 ws.ws_ypixel = height; 822 ws.ws_ypixel = height;
799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
800 824
801#if 0 825#if 0
802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 826 // TIOCSWINSZ is supposed to do this automatically and correctly
803 if (cmd_pid) /* force through to the command */ 827 if (cmd_pid) /* force through to the command */
804 kill (-cmd_pid, SIGWINCH); 828 kill (-cmd_pid, SIGWINCH);
805#endif 829#endif
806} 830}
807 831
… …
836 delete fontset[0]; 860 delete fontset[0];
837 fontset[0] = fs; 861 fontset[0] = fs;
838 862
839 prop = (*fs)[1]->properties (); 863 prop = (*fs)[1]->properties ();
840 prop.height += lineSpace; 864 prop.height += lineSpace;
865
841 fs->set_prop (prop); 866 fs->set_prop (prop, false);
842 867
843 fwidth = prop.width; 868 fwidth = prop.width;
844 fheight = prop.height; 869 fheight = prop.height;
845 fbase = prop.ascent; 870 fbase = prop.ascent;
846 871
… …
855 { 880 {
856 fontset[style] = fs = new rxvt_fontset (this); 881 fontset[style] = fs = new rxvt_fontset (this);
857 rxvt_fontprop prop2 = prop; 882 rxvt_fontprop prop2 = prop;
858 883
859 if (res) 884 if (res)
860 prop2.weight = prop2.slant = rxvt_fontprop::unset; 885 {
886 fs->populate (res);
887 fs->set_prop (prop2, false);
888 }
861 else 889 else
862 { 890 {
863 res = fontset[0]->fontdesc; 891 fs->populate (fontset[0]->fontdesc);
864 892
865 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 893 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
866 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 894 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
895
896 fs->set_prop (prop2, true);
867 } 897 }
868 898
869 fs->populate (res);
870 fs->set_prop (prop2);
871 } 899 }
872#else 900#else
873 fontset[style] = fontset[0]; 901 fontset[style] = fontset[0];
874#endif 902#endif
875 } 903 }
… …
877 if (parent[0]) 905 if (parent[0])
878 { 906 {
879 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
880 scr_remap_chars (); 908 scr_remap_chars ();
881 scr_touch (true); 909 scr_touch (true);
882 } 910 }
883 911
884 return true; 912 return true;
885} 913}
886 914
915void
887void rxvt_term::set_string_property (Atom prop, const char *str, int len) 916rxvt_term::set_string_property (Atom prop, const char *str, int len)
888{ 917{
889 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
890 prop, XA_STRING, 8, PropModeReplace, 919 prop, XA_STRING, 8, PropModeReplace,
891 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 920 (const unsigned char *)str, len >= 0 ? len : strlen (str));
892} 921}
893 922
923void
894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 924rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
895{ 925{
896 wchar_t *ws = rxvt_mbstowcs (str, len); 926 wchar_t *ws = rxvt_mbstowcs (str, len);
897 char *s = rxvt_wcstoutf8 (ws); 927 char *s = rxvt_wcstoutf8 (ws);
898 928
899 XChangeProperty (display->display, parent[0], 929 XChangeProperty (dpy, parent[0],
900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 930 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901 (const unsigned char *)s, strlen (s)); 931 (const unsigned char *)s, strlen (s));
902 932
903 free (s); 933 free (s);
904 free (ws); 934 free (ws);
… …
923#if ENABLE_EWMH 953#if ENABLE_EWMH
924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
925#endif 955#endif
926} 956}
927 957
958void
959rxvt_term::set_window_color (int idx, const char *color)
960{
928#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
929void
930rxvt_term::set_window_color (int idx, const char *color)
931{
932 rxvt_color xcol; 962 rxvt_color xcol;
933 int i; 963 int i;
934 964
935 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
936 return; 966 return;
937 967
968 color = strdup (color);
969 allocated.push_back ((void *)color);
970 rs[Rs_color + idx] = color;
971
938 /* handle color aliases */ 972 /* handle color aliases */
939 if (isdigit (*color)) 973 if (isdigit (*color))
940 { 974 {
941 i = atoi (color); 975 i = atoi (color);
942 976
943 if (i >= 8 && i <= 15) 977 if (i >= 8 && i <= 15)
978 {
944 { /* bright colors */ 979 /* bright colors */
945 i -= 8;
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
947 SET_PIXCOLOR (idx);
948 goto done; 981 goto done;
949 } 982 }
950 983
951 if (i >= 0 && i <= 7) 984 if (i >= 0 && i <= 7)
985 {
952 { /* normal colors */ 986 /* normal colors */
953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx);
955 goto done; 988 goto done;
956 } 989 }
957 } 990 }
958 991
959 if (!rXParseAllocColor (&xcol, color)) 992 set_color (xcol, color);
960 return;
961
962 /* XStoreColor (display->display, display->cmap, XColor*); */
963 993
964 /* 994 /*
965 * FIXME: should free colors here, but no idea how to do it so instead, 995 * FIXME: should free colors here, but no idea how to do it so instead,
966 * so just keep gobbling up the colormap 996 * so just keep gobbling up the colormap
967 */ 997 */
968# if 0
969 for (i = Color_Black; i <= Color_White; i++)
970 if (pix_colors[idx] == pix_colors[i])
971 break;
972 if (i > Color_White)
973 {
974 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976 DisplayPlanes (display->display, display->screen));
977 }
978# endif
979 998
980 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx);
982 1000
983 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */
985done: 1001done:
986
987#if OFF_FOCUS_FADING
988 if (rs[Rs_fade])
989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
990#endif
991
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 1002 /*TODO: handle Color_BD, scrollbar background, etc. */
993 1003
1004 update_fade_color (idx);
994 recolour_cursor (); 1005 recolour_cursor ();
995 scr_recolour (); 1006 scr_recolour ();
1007#endif /* XTERM_COLOR_CHANGE */
996} 1008}
997
998#else
999# define set_window_color (idx,color) ((void)0)
1000#endif /* XTERM_COLOR_CHANGE */
1001 1009
1002void 1010void
1003rxvt_term::recolour_cursor () 1011rxvt_term::recolour_cursor ()
1004{ 1012{
1005 XColor xcol[2]; 1013 XColor fg, bg;
1006 1014
1007 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1015 (ISSET_PIXCOLOR (Color_pointer_fg)
1008 ? pix_colors_focused[Color_pointer_fg] 1016 ? pix_colors_focused[Color_pointer_fg]
1009 : pix_colors_focused[Color_fg]; 1017 : pix_colors_focused[Color_fg]).get (fg);
1018
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1019 (ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 1020 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 1021 : pix_colors_focused[Color_bg]).get (bg);
1013 1022
1014 XQueryColors (display->display, display->cmap, xcol, 2); 1023 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 1024}
1017 1025
1018/*----------------------------------------------------------------------*/ 1026/*----------------------------------------------------------------------*/
1019/* 1027/*
1020 * find if fg/bg matches any of the normal (low-intensity) colors 1028 * find if fg/bg matches any of the normal (low-intensity) colors
1021 */ 1029 */
1022void 1030void
1023rxvt_term::set_colorfgbg () 1031rxvt_term::set_colorfgbg ()
1024{ 1032{
1025 unsigned int i; 1033 unsigned int i;
1026 const char *xpmb = "\0"; 1034 const char *xpmb = "";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1035 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 1036
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 1037 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 1038 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 1040 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 1041 {
… …
1038 1045
1039 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 1047 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 1048 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 1049 sprintf (bstr, "%d", (i - Color_Black));
1043#ifdef XPM_BACKGROUND 1050#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 1051 xpmb = "default;";
1045#endif 1052#endif
1046 break; 1053 break;
1047 } 1054 }
1048 1055
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1056 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050} 1057}
1051 1058
1052/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1053 1060
1054int 1061bool
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1062rxvt_term::set_color (rxvt_color &color, const char *name)
1056{ 1063{
1057 if (!screen_in_out->set (display, colour)) 1064 if (color.set (this, name))
1058 {
1059 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060 return false;
1061 }
1062
1063 return true; 1065 return true;
1066
1067 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1068 return false;
1069}
1070
1071void
1072rxvt_term::alias_color (int dst, int src)
1073{
1074 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1064} 1075}
1065 1076
1066/* -------------------------------------------------------------------- * 1077/* -------------------------------------------------------------------- *
1067 * - WINDOW RESIZING - * 1078 * - WINDOW RESIZING - *
1068 * -------------------------------------------------------------------- */ 1079 * -------------------------------------------------------------------- */
1069void 1080void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1082{
1072 int fix_screen; 1083 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1084 int old_width = szHint.width;
1074 dDisp; 1085 int old_height = szHint.height;
1075 1086
1076 window_calc (newwidth, newheight); 1087 window_calc (newwidth, newheight);
1088
1089 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent[0], &szHint);
1078 1091
1079 if (!ignoreparent) 1092 if (!ignoreparent)
1080 { 1093 {
1081#ifdef SMART_RESIZE 1094#ifdef SMART_RESIZE
1082 /* 1095 /*
… …
1086 int x, y, x1, y1; 1099 int x, y, x1, y1;
1087 int dx, dy; 1100 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1101 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 1102 Window unused_cr;
1090 1103
1091 XTranslateCoordinates (disp, parent[0], display->root, 1104 XTranslateCoordinates (dpy, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 1105 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1106 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1107 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 1108 /*
1096 * if display->root isn't the parent window, a WM will probably have offset 1109 * if display->root isn't the parent window, a WM will probably have offset
1097 * our position for handles and decorations. Counter it 1110 * our position for handles and decorations. Counter it
1098 */ 1111 */
… …
1100 { 1113 {
1101 x -= x1; 1114 x -= x1;
1102 y -= y1; 1115 y -= y1;
1103 } 1116 }
1104 1117
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1118 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1119 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1120 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1121 dy = old_height - szHint.height;
1109 1122
1110 /* Check position of the center of the window */ 1123 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1124 if (x < x1) /* left half */
1112 dx = 0; 1125 dx = 0;
… …
1115 if (y < y1) /* top half */ 1128 if (y < y1) /* top half */
1116 dy = 0; 1129 dy = 0;
1117 else if (y == y1) /* exact center */ 1130 else if (y == y1) /* exact center */
1118 dy /= 2; 1131 dy /= 2;
1119 1132
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1133 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 1134 szHint.width, szHint.height);
1122#else 1135#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1136 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1124#endif 1137#endif
1125 } 1138 }
1126 1139
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1140 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 1141
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 1142 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 1143 {
1131 if (scrollBar.state) 1144 if (scrollBar.state)
1132 { 1145 {
1133 XMoveResizeWindow (disp, scrollBar.win, 1146 XMoveResizeWindow (dpy, scrollBar.win,
1134 window_sb_x, 0, 1147 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height); 1148 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar (); 1149 resize_scrollbar ();
1137 } 1150 }
1138 1151
1139 XMoveResizeWindow (disp, vt, 1152 XMoveResizeWindow (dpy, vt,
1140 window_vt_x, window_vt_y, 1153 window_vt_x, window_vt_y,
1141 width, height); 1154 width, height);
1142 1155
1156#ifdef HAVE_BG_PIXMAP
1157 if (bgPixmap.window_size_sensitive ())
1158 update_background ();
1159#endif
1160
1143 scr_clear (); 1161 scr_clear ();
1144#ifdef XPM_BACKGROUND
1145 resize_pixmap ();
1146#endif
1147 } 1162 }
1148 1163
1149 if (fix_screen || old_height == 0) 1164 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1165 scr_reset ();
1164 1166
1165 if (curr_screen >= 0) /* this is not the first time through */ 1167 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 { 1168 //scr_touch (false);
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171 1169
1172 old_width = szHint.width; 1170#ifdef HAVE_BG_PIXMAP
1173 old_height = szHint.height; 1171// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174 1172// if (bgPixmap.pixmap)
1175#ifdef XPM_BACKGROUND
1176 if (pixmap)
1177 scr_touch (false); 1173// scr_touch (false);
1178#endif 1174#endif
1179 1175
1180#ifdef USE_XIM 1176#ifdef USE_XIM
1181 IMSetStatusPosition (); 1177 IMSetPosition ();
1182#endif 1178#endif
1183} 1179}
1184 1180
1185/* 1181/*
1186 * Set the width/height of the vt window in characters. Units are pixels. 1182 * Set the width/height of the vt window in characters. Units are pixels.
… …
1191{ 1187{
1192 XWindowAttributes wattr; 1188 XWindowAttributes wattr;
1193 1189
1194 if (newwidth == 0 || newheight == 0) 1190 if (newwidth == 0 || newheight == 0)
1195 { 1191 {
1196 XGetWindowAttributes (display->display, display->root, &wattr); 1192 XGetWindowAttributes (dpy, display->root, &wattr);
1197 1193
1198 if (newwidth == 0) 1194 if (newwidth == 0)
1199 newwidth = wattr.width - szHint.base_width; 1195 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1196 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1197 newheight = wattr.height - szHint.base_height;
… …
1215#ifdef USE_XIM 1211#ifdef USE_XIM
1216 1212
1217void 1213void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1214rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1215{
1220 fg = pix_colors[Color_fg]; 1216 fg = pix_colors [Color_fg];
1221 bg = pix_colors[Color_bg]; 1217 bg = pix_colors [Color_bg];
1222} 1218}
1223 1219
1224void 1220void
1225rxvt_term::im_set_size (XRectangle &size) 1221rxvt_term::im_set_size (XRectangle &size)
1226{ 1222{
… …
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1259 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264 1260
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1261 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266 *p = '\0'; 1262 *p = '\0';
1267 1263
1268 atom = XInternAtom (display->display, server, False); 1264 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (display->display, atom); 1265 win = XGetSelectionOwner (dpy, atom);
1270 1266
1271 if (win != None) 1267 if (win != None)
1272 return True; 1268 return True;
1273 } 1269 }
1274 1270
… …
1281 XPoint nspot; 1277 XPoint nspot;
1282 XVaNestedList preedit_attr; 1278 XVaNestedList preedit_attr;
1283 1279
1284 if (!Input_Context 1280 if (!Input_Context
1285 || !focus 1281 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1282 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1283 return;
1288 1284
1289 im_set_position (nspot); 1285 im_set_position (nspot);
1290 1286
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1287 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1306 input_method = 0;
1311 } 1307 }
1312 1308
1313 Input_Context = 0; 1309 Input_Context = 0;
1314} 1310}
1311
1312#ifdef ENABLE_XIM_ONTHESPOT
1313
1314static void
1315xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1319}
1320
1321static void
1322xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1323{
1324 ((rxvt_term *)client_data)->make_current ();
1325 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1326}
1327
1328static void
1329xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1330{
1331 rxvt_term *term = (rxvt_term *)client_data;
1332 XIMText *text = call_data->text;
1333
1334 term->make_current ();
1335
1336 if (text)
1337 {
1338 void *str;
1339
1340 if (!text->encoding_is_wchar && text->string.multi_byte)
1341 {
1342 // of course, X makes it ugly again
1343 if (term->rs[Rs_imLocale])
1344 SET_LOCALE (term->rs[Rs_imLocale]);
1345
1346 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1347 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1348
1349 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->locale);
1351 }
1352 else
1353 str = (void *)text->string.wide_char;
1354
1355 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1356 DT_INT, call_data->caret,
1357 DT_INT, call_data->chg_first,
1358 DT_INT, call_data->chg_length,
1359 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1360 DT_WCS_LEN, str, str ? (int)text->length : 0,
1361 DT_END));
1362 }
1363 else
1364 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1365 DT_INT, call_data->caret,
1366 DT_INT, call_data->chg_first,
1367 DT_INT, call_data->chg_length,
1368 DT_END));
1369}
1370
1371#if 0
1372static void
1373xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1374{
1375 ((rxvt_term *)client_data)->make_current ();
1376 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1377 DT_INT, call_data->position,
1378 DT_INT, call_data->direction,
1379 DT_INT, call_data->style,
1380 DT_END));
1381}
1382#endif
1383
1384#endif
1315 1385
1316/* 1386/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1387 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1388 * open a suitable preedit type
1319 */ 1389 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1396 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1397 unsigned long fg, bg;
1328 const char *p; 1398 const char *p;
1329 char **s; 1399 char **s;
1330 XIMStyles *xim_styles; 1400 XIMStyles *xim_styles;
1401#ifdef ENABLE_XIM_ONTHESPOT
1402 XIMCallback xcb[4];
1403#endif
1331 1404
1332 set_environ (envv); 1405 set_environ (envv);
1333 1406
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1407 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1408 return false;
1336 1409
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1410 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1411 if (input_method == NULL)
1340 return false; 1412 return false;
1341 1413
1342 xim = input_method->xim; 1414 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1434 s = rxvt_splitcommastring (p);
1363 1435
1364 for (i = found = 0; !found && s[i]; i++) 1436 for (i = found = 0; !found && s[i]; i++)
1365 { 1437 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1438 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1439 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1440 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1441 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1442 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1443 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1444 else if (!strcmp (s[i], "None"))
1373 input_style = (XIMPreeditNone | XIMStatusNone); 1445 input_style = XIMPreeditNone | XIMStatusNone;
1446#ifdef ENABLE_XIM_ONTHESPOT
1447 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1448 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1449#endif
1450 else
1451 input_style = XIMPreeditNothing | XIMStatusNothing;
1374 1452
1375 for (j = 0; j < xim_styles->count_styles; j++) 1453 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1454 if (input_style == xim_styles->supported_styles[j])
1377 { 1455 {
1378 rxvt_freecommastring (s); 1456 rxvt_freecommastring (s);
… …
1416 "*", 1494 "*",
1417 fheight, 1495 fheight,
1418 fheight + 1, fheight - 1, 1496 fheight + 1, fheight - 1,
1419 fheight - 2, fheight + 2); 1497 fheight - 2, fheight + 2);
1420 1498
1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1499 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422 &missing_charset_list, &missing_charset_count, &def_string); 1500 &missing_charset_list, &missing_charset_count, &def_string);
1423 1501
1424 if (missing_charset_list) 1502 if (missing_charset_list)
1425 XFreeStringList (missing_charset_list); 1503 XFreeStringList (missing_charset_list);
1426 1504
… …
1467 XNBackground, bg, 1545 XNBackground, bg,
1468 XNArea, &status_rect, 1546 XNArea, &status_rect,
1469 XNFontSet, fs, 1547 XNFontSet, fs,
1470 NULL); 1548 NULL);
1471 } 1549 }
1550#if ENABLE_XIM_ONTHESPOT
1551 else if (input_style & XIMPreeditCallbacks)
1552 {
1553 im_set_position (spot);
1554
1555 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1556 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1557 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1558# if 0
1559 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1560# endif
1561
1562 preedit_attr = XVaCreateNestedList (0,
1563 XNSpotLocation, &spot,
1564 XNPreeditStartCallback, &xcb[0],
1565 XNPreeditDoneCallback , &xcb[1],
1566 XNPreeditDrawCallback , &xcb[2],
1567# if 0
1568 XNPreeditCaretCallback, &xcb[3],
1569# endif
1570 NULL);
1571 }
1572#endif
1472 1573
1473 Input_Context = XCreateIC (xim, 1574 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1575 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1576 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1577 XNFocusWindow, parent[0],
… …
1478 preedit_attr, 1579 preedit_attr,
1479 status_attr ? XNStatusAttributes : NULL, 1580 status_attr ? XNStatusAttributes : NULL,
1480 status_attr, NULL); 1581 status_attr, NULL);
1481 1582
1482 if (preedit_attr) XFree (preedit_attr); 1583 if (preedit_attr) XFree (preedit_attr);
1483 if (status_attr) XFree (status_attr); 1584 if (status_attr) XFree (status_attr);
1484 if (fs) XFreeFontSet (display->display, fs); 1585 if (fs) XFreeFontSet (dpy, fs);
1485 1586
1486 if (Input_Context == NULL) 1587 if (Input_Context == NULL)
1487 { 1588 {
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1589 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1590 im_destroy ();
1490 return false; 1591 return false;
1491 } 1592 }
1492 1593
1493 if (input_style & XIMPreeditArea) 1594#if 0
1595 // unfortunately, only the focus window is used by XIM, hard to fix
1596 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1597 vt_select_input ();
1598#endif
1599
1494 IMSetStatusPosition (); 1600 IMSetPosition ();
1495 1601
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1602 return true;
1498} 1603}
1499 1604
1500void 1605void
1501rxvt_term::im_cb () 1606rxvt_term::im_cb ()
… …
1507 1612
1508 make_current (); 1613 make_current ();
1509 1614
1510 im_destroy (); 1615 im_destroy ();
1511 1616
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1617 if (Input_Context)
1514 return; 1618 return;
1515 1619
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1620#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1621 if (rs[Rs_imLocale])
… …
1559 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1560#endif 1664#endif
1561} 1665}
1562 1666
1563void 1667void
1564rxvt_term::IMSetStatusPosition () 1668rxvt_term::IMSetPosition ()
1565{ 1669{
1566 XRectangle preedit_rect, status_rect, *needed_rect; 1670 XRectangle preedit_rect, status_rect, *needed_rect;
1567 XVaNestedList preedit_attr, status_attr; 1671 XVaNestedList preedit_attr, status_attr;
1568 1672
1569 if (!Input_Context 1673 if (!Input_Context
1570 || !focus 1674 || !focus
1571 || !(input_style & XIMPreeditArea) 1675 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1572 || !IMisRunning ()) 1676 || !IMisRunning ())
1573 return; 1677 return;
1574 1678
1679 if (input_style & XIMPreeditPosition)
1680 {
1681 im_set_size (preedit_rect);
1682 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1683
1684 XSetICValues (Input_Context,
1685 XNPreeditAttributes, preedit_attr, NULL);
1686 }
1687 else
1688 {
1575 /* Getting the necessary width of preedit area */ 1689 /* Getting the necessary width of preedit area */
1576 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1690 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1577 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1691 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1578 XFree (status_attr); 1692 XFree (status_attr);
1579 1693
1580 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1694 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1581 XFree (needed_rect); 1695 XFree (needed_rect);
1582 1696
1583 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1697 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1584 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1698 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1585 1699
1586 XSetICValues (Input_Context, 1700 XSetICValues (Input_Context,
1587 XNPreeditAttributes, preedit_attr, 1701 XNPreeditAttributes, preedit_attr,
1588 XNStatusAttributes, status_attr, NULL); 1702 XNStatusAttributes, status_attr,
1703 NULL);
1589 1704
1705 XFree (status_attr);
1706 }
1707
1590 XFree (preedit_attr); 1708 XFree (preedit_attr);
1591 XFree (status_attr);
1592} 1709}
1593#endif /* USE_XIM */ 1710#endif /* USE_XIM */
1711
1712void
1713rxvt_term::get_window_origin (int &x, int &y)
1714{
1715 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1718}
1719
1720Pixmap
1721rxvt_term::get_pixmap_property (int prop_id)
1722{
1723 if (prop_id > 0 && prop_id < NUM_XA)
1724 if (xa[prop_id])
1725 {
1726 int aformat;
1727 unsigned long nitems, bytes_after;
1728 Atom atype;
1729 unsigned char *prop = NULL;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP)
1734 {
1735 return *(Pixmap *)prop;
1736 }
1737 }
1738 return None;
1739}
1740
1741#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS
1743# undef update_background
1744int rxvt_term::trace_update_background (const char *file, int line)
1745{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background ();
1748}
1749# endif
1750
1751int
1752rxvt_term::update_background ()
1753{
1754 bgPixmap.invalidate ();
1755
1756 /* no chance of real time refresh if we are blurring! */
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1758 bgPixmap.render ();
1759 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering ())
1764 update_background_ev.start (.05);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772}
1773
1774void
1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{
1777 make_current ();
1778 bgPixmap.render ();
1779 refresh_check ();
1780}
1781
1782#endif /* HAVE_BG_PIXMAP */
1594 1783
1595/*----------------------- end-of-file (C source) -----------------------*/ 1784/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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