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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC vs.
Revision 1.105 by sf-exg, Mon Nov 1 11:36:48 2010 UTC

… …
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) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
175{ 176{
176# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
177 if (original_asim) 178 if (original_asim)
178 return true; 179 return true;
179# endif 180# endif
180# ifdef ENABLE_TRANSPARENCY
181 if (flags & isTransparent)
182 {
183# ifdef HAVE_AFTERIMAGE
184 if ((flags & blurNeeded) && !(flags & blurServerSide))
185 return true;
186# endif
187 if ((flags & tintNeeded) && !(flags & tintServerSide))
188 return true;
189 }
190# endif
191 return false; 181 return false;
192} 182}
193 183
194# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
195static inline bool 185static inline bool
… …
232 int diff = window_size - image_size; 222 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
234 224
235 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
236 return diff * align / 100; 226 return diff * align / 100;
237 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
238 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
239 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
240 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
241 return 0; 231 return 0;
242} 232}
… …
438 { 428 {
439 flags = new_flags; 429 flags = new_flags;
440 changed++; 430 changed++;
441 } 431 }
442 432
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 433 return (changed > 0);
446} 434}
447 435
448void 436void
449bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
… …
478 x = make_align_position (h_align, target_width, w); 466 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 467 y = make_align_position (v_align, target_height, h);
480 } 468 }
481 469
482 flags &= ~sizeSensitive; 470 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 471 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 472 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 473 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 474 flags |= sizeSensitive;
487} 475}
488 476
489# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
… …
539 527
540 int x = 0; 528 int x = 0;
541 int y = 0; 529 int y = 0;
542 int w = 0; 530 int w = 0;
543 int h = 0; 531 int h = 0;
544
545 TIMING_TEST_START (asim);
546 532
547 if (original_asim) 533 if (original_asim)
548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
549 535
550 if (!original_asim 536 if (!original_asim
… …
667 } 653 }
668 654
669 free (layers); 655 free (layers);
670 } 656 }
671 } 657 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 658
674 bool ret = false; 659 bool ret = false;
675 660
676 if (result) 661 if (result)
677 { 662 {
… …
723 708
724 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
725 destroy_asimage (&result); 710 destroy_asimage (&result);
726 711
727 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 713
730 ret = true; 714 ret = true;
731 } 715 }
732 716
733 if (background) 717 if (background)
… …
745 return false; 729 return false;
746 730
747 if (!pixbuf) 731 if (!pixbuf)
748 return false; 732 return false;
749 733
750#if !XFT 734#if !XRENDER
751 if (background_flags) 735 if (background_flags)
752 return false; 736 return false;
753#endif 737#endif
754 738
755 GdkPixbuf *result; 739 GdkPixbuf *result;
… …
872 dst_width, dst_height, 856 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
874 0, 0); 858 0, 0);
875 } 859 }
876 860
877#if XFT 861#if XRENDER
878 if (background_flags) 862 if (background_flags)
879 { 863 {
880 Display *dpy = target->dpy; 864 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa; 865 XRenderPictureAttributes pa;
882 866
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885 869
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888 872
… …
941 } 925 }
942 926
943# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 928 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
947 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
948 have_image = true; 936 have_image = true;
949 return have_image; 937 return true;
938 }
950# endif 939# endif
951 940
952# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
954 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
955 have_image = true; 948 have_image = true;
956 return have_image; 949 return true;
950 }
957# endif 951# endif
958 } 952 }
959 953
960 return false; 954 return false;
961} 955}
… …
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
1008 else 1002 else
1009 flags |= blurNeeded; 1003 flags |= blurNeeded;
1010 1004
1011#if XFT 1005#if XRENDER
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1013 if (filters) 1007 if (filters)
1014 { 1008 {
1015 for (int i = 0; i < filters->nfilter; i++) 1009 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution)) 1010 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide; 1011 flags |= bgPixmap_t::blurServerSide;
1018 1012
1019 XFree (filters); 1013 XFree (filters);
1020 } 1014 }
1021#endif 1015#endif
1022 1016
1023 return (changed > 0); 1017 return (changed > 0);
1024} 1018}
1025 1019
… …
1056 { 1050 {
1057 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
1059 else 1053 else
1060 { 1054 {
1061#if XFT 1055#if XRENDER
1062 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
1063#endif 1057#endif
1064 } 1058 }
1065 } 1059 }
1066 1060
… …
1113 } 1107 }
1114 1108
1115 return false; 1109 return false;
1116} 1110}
1117 1111
1112#if XRENDER
1118static void 1113static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1115{
1121 double sigma = radius / 2.0; 1116 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1117 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1118 double sum = 0.0;
1124 1119
1125 for (int i = 0; i < width; i++) 1120 for (int i = 0; i < width; i++)
1126 { 1121 {
1127 double x = i - width / 2; 1122 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1123 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1124 sum += kernel[i];
1130 } 1125 }
1131 1126
1132 params[0] = XDoubleToFixed (width); 1127 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1128 params[1] = XDoubleToFixed (1);
1134 1129
1135 for (int i = 0; i < width; i++) 1130 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1131 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1132}
1133#endif
1138 1134
1139bool 1135bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1137{
1142 bool ret = false; 1138 bool ret = false;
1143#if XFT 1139#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1141 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1143
1148 Display *dpy = target->dpy; 1144 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1145 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1147
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1148 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1149 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1150
1155 if (kernel && params && src && dst) 1151 if (kernel && params && src && dst)
… …
1225 XFreeGC (dpy, gc); 1221 XFreeGC (dpy, gc);
1226 } 1222 }
1227 } 1223 }
1228 else 1224 else
1229 { 1225 {
1230# if XFT 1226# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1228
1233 if (flags & tintSet) 1229 if (flags & tintSet)
1234 tint.get (c); 1230 tint.get (c);
1235 1231
… …
1281 } 1277 }
1282 1278
1283 XRenderFreePicture (dpy, mask_pic); 1279 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1280 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1281 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1282# endif
1290 } 1283 }
1291 1284
1292 return ret; 1285 return ret;
1293} 1286}
1294 1287
1295/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1289 * Builds a pixmap of the same size as the terminal window that contains
1297 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1290 * the tiled portion of the root pixmap that is supposed to be covered by
1298 * our window. 1291 * our window.
1299 */ 1292 */
1300unsigned long 1293unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1294bgPixmap_t::make_transparency_pixmap ()
1302{ 1295{
… …
1306 return 0; 1299 return 0;
1307 1300
1308 /* root dimensions may change from call to call - but Display structure should 1301 /* root dimensions may change from call to call - but Display structure should
1309 * be always up-to-date, so let's use it : 1302 * be always up-to-date, so let's use it :
1310 */ 1303 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1304 int screen = target->display->screen;
1313 Display *dpy = target->dpy; 1305 Display *dpy = target->dpy;
1306 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1319 int sx, sy; 1312 int sx, sy;
1320 XGCValues gcv; 1313 XGCValues gcv;
1321 GC gc; 1314 GC gc;
1322 1315
1323 TIMING_TEST_START (tp);
1324 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1325 1317
1326 /* check if we are outside of the visible part of the virtual screen : */ 1318 /* check if we are outside of the visible part of the virtual screen : */
1327 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1328 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1329 return 0; 1321 return 0;
1330 1322
1323 // validate root pixmap and get its size
1331 if (root_pixmap != None) 1324 if (root_pixmap != None)
1332 { 1325 {
1333 /* we want to validate the pixmap and get its size at the same time : */ 1326 Window wdummy;
1334 int junk; 1327 int idummy;
1335 unsigned int ujunk; 1328 unsigned int udummy;
1336 /* root pixmap may be bad - allow a error */ 1329
1337 target->allowedxerror = -1; 1330 target->allowedxerror = -1;
1338 1331
1339 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1332 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1340 root_pixmap = None; 1333 root_pixmap = None;
1341 1334
1342 target->allowedxerror = 0; 1335 target->allowedxerror = 0;
1336 }
1337
1338 Pixmap recoded_root_pmap = root_pixmap;
1339
1340 if (root_pixmap != None && root_depth != target->depth)
1341 {
1342#if XRENDER
1343 XRenderPictureAttributes pa;
1344
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351
1352 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1354 else
1355 {
1356 XFreePixmap (dpy, recoded_root_pmap);
1357 root_pixmap = None;
1358 }
1359
1360 XRenderFreePicture (dpy, src);
1361 XRenderFreePicture (dpy, dst);
1362#else
1363 root_pixmap = None;
1364#endif
1343 } 1365 }
1344 1366
1345 if (root_pixmap == None) 1367 if (root_pixmap == None)
1346 return 0; 1368 return 0;
1347 1369
1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1370 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1349 1371
1350 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1372 if (tiled_root_pmap == None) /* something really bad happened - abort */
1351 return 0; 1373 return 0;
1352 1374
1353 /* straightforward pixmap copy */ 1375 /* straightforward pixmap copy */
1354 gcv.tile = root_pixmap; 1376 gcv.tile = recoded_root_pmap;
1355 gcv.fill_style = FillTiled; 1377 gcv.fill_style = FillTiled;
1356 1378
1357 while (sx < 0) sx += (int)root_width; 1379 while (sx < 0) sx += (int)root_width;
1358 while (sy < 0) sy += (int)root_height; 1380 while (sy < 0) sy += (int)root_height;
1359 1381
1360 gcv.ts_x_origin = -sx; 1382 gcv.ts_x_origin = -sx;
1361 gcv.ts_y_origin = -sy; 1383 gcv.ts_y_origin = -sy;
1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1384 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1363 1385
1364 if (gc) 1386 if (gc)
1365 { 1387 {
1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1388 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1367 result |= transpPmapTiled; 1389 result |= transpPmapTiled;
1368 XFreeGC (dpy, gc); 1390 XFreeGC (dpy, gc);
1369 } 1391 }
1370 TIMING_TEST_PRINT_RESULT (tp);
1371 1392
1372 if (tiled_root_pmap != None) 1393 if (tiled_root_pmap != None)
1373 { 1394 {
1374 if (!need_client_side_rendering ()) 1395 if (!need_client_side_rendering ())
1375 { 1396 {
1376 if ((flags & blurNeeded)) 1397 if ((flags & blurNeeded)
1398 && (flags & blurServerSide))
1377 { 1399 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1400 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1379 result |= transpPmapBlurred; 1401 result |= transpPmapBlurred;
1380 } 1402 }
1381 if ((flags & tintNeeded)) 1403 if ((flags & tintNeeded)
1404 && (flags & tintServerSide))
1382 { 1405 {
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1406 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1384 result |= transpPmapTinted; 1407 result |= transpPmapTinted;
1385 } 1408 }
1386 } /* server side rendering completed */ 1409 } /* server side rendering completed */
1387 1410
1388 if (pixmap) 1411 if (pixmap)
1389 XFreePixmap (dpy, pixmap); 1412 XFreePixmap (dpy, pixmap);
1390 1413
1391 pixmap = tiled_root_pmap; 1414 pixmap = tiled_root_pmap;
1392 pmap_width = window_width; 1415 pmap_width = window_width;
1393 pmap_height = window_height; 1416 pmap_height = window_height;
1394 pmap_depth = root_depth; 1417 pmap_depth = target->depth;
1395 } 1418 }
1396 1419
1397 TIMING_TEST_PRINT_RESULT (tp); 1420 if (recoded_root_pmap != root_pixmap)
1421 XFreePixmap (dpy, recoded_root_pmap);
1398 1422
1399 return result; 1423 return result;
1400} 1424}
1401 1425
1402bool 1426void
1403bgPixmap_t::set_root_pixmap () 1427bgPixmap_t::set_root_pixmap ()
1404{ 1428{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1429 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1406 if (new_root_pixmap == None) 1430 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1431 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1408 1432
1409 if (new_root_pixmap != root_pixmap)
1410 {
1411 root_pixmap = new_root_pixmap; 1433 root_pixmap = new_root_pixmap;
1412 return true;
1413 }
1414
1415 return false;
1416} 1434}
1417# endif /* ENABLE_TRANSPARENCY */ 1435# endif /* ENABLE_TRANSPARENCY */
1418 1436
1419# ifndef HAVE_AFTERIMAGE 1437# ifndef HAVE_AFTERIMAGE
1420static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1438static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1421# endif 1439# endif
1422 1440
1423bool 1441bool
1424bgPixmap_t::render () 1442bgPixmap_t::render ()
1425{ 1443{
1426 unsigned long background_flags = 0; 1444 unsigned long background_flags = 0;
1427 1445
1428 if (target == NULL) 1446 if (target == NULL)
1429 return false; 1447 return false;
1430
1431 TIMING_TEST_START (tp);
1432 1448
1433 invalidate (); 1449 invalidate ();
1434# ifdef ENABLE_TRANSPARENCY 1450# ifdef ENABLE_TRANSPARENCY
1435 if (flags & isTransparent) 1451 if (flags & isTransparent)
1436 { 1452 {
1437 /* we need to re-generate transparency pixmap in that case ! */ 1453 /* we need to re-generate transparency pixmap in that case ! */
1438 background_flags = make_transparency_pixmap (); 1454 background_flags = make_transparency_pixmap ();
1439 if (background_flags == 0) 1455 if (background_flags == 0)
1440 return false; 1456 return false;
1441 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1457 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1442 && pmap_depth == target->depth)
1443 flags = flags & ~isInvalid; 1458 flags = flags & ~isInvalid;
1444 } 1459 }
1445# endif 1460# endif
1446 1461
1447# ifdef BG_IMAGE_FROM_FILE 1462# ifdef BG_IMAGE_FROM_FILE
… …
1460 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1475 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1461 } 1476 }
1462 1477
1463 if (result) 1478 if (result)
1464 { 1479 {
1465# if !defined(HAVE_AFTERIMAGE) && !XFT 1480# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1466 /* our own client-side tinting */ 1481 /* our own client-side tinting */
1467 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1468 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1482 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1470 { 1483 {
1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1484 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1472 if (flags & tintSet) 1485 if (flags & tintSet)
1473 tint.get (c); 1486 tint.get (c);
1474 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1487 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1475 } 1488 }
1476# endif 1489# endif
1477 1490
1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1491 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1479 1492
1480 if (gc) 1493 if (gc)
1481 { 1494 {
1482 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1483 {
1484 XFreePixmap (target->dpy, pixmap);
1485 pixmap = None;
1486 }
1487
1488 if (pixmap == None)
1489 {
1490 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1491 pmap_width = result->width;
1492 pmap_height = result->height;
1493 pmap_depth = target->depth;
1494 }
1495
1496 if (pmap_depth != result->depth)
1497 {
1498 /* Bad Match error will ensue ! stupid X !!!! */
1499 if (result->depth == 24 && pmap_depth == 32)
1500 result->depth = 32;
1501 else if (result->depth == 32 && pmap_depth == 24)
1502 result->depth = 24;
1503 else
1504 {
1505 /* TODO: implement image recoding */
1506 }
1507 }
1508
1509 if (pmap_depth == result->depth)
1510 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1495 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1511 1496
1512 XFreeGC (target->dpy, gc); 1497 XFreeGC (target->dpy, gc);
1513 flags = flags & ~isInvalid; 1498 flags = flags & ~isInvalid;
1514 } 1499 }
1515 1500
… …
1525 } 1510 }
1526 } 1511 }
1527 1512
1528 apply (); 1513 apply ();
1529 1514
1530 XSync (target->dpy, False);
1531 valid_since = ev::now (); 1515 valid_since = ev::now ();
1532
1533 TIMING_TEST_PRINT_RESULT (tp);
1534 1516
1535 return true; 1517 return true;
1536} 1518}
1537 1519
1538bool 1520bool
… …
1540{ 1522{
1541 if (new_target) 1523 if (new_target)
1542 if (target != new_target) 1524 if (target != new_target)
1543 { 1525 {
1544 target = new_target; 1526 target = new_target;
1545# ifdef ENABLE_TRANSPARENCY
1546 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1547# endif
1548 return true; 1527 return true;
1549 } 1528 }
1550 1529
1551 return false; 1530 return false;
1552} 1531}
… …
1554void 1533void
1555bgPixmap_t::apply () 1534bgPixmap_t::apply ()
1556{ 1535{
1557 if (target) 1536 if (target)
1558 { 1537 {
1559 flags &= ~isVtOrigin;
1560
1561 if (pixmap != None) 1538 if (pixmap != None)
1562 { 1539 {
1563 /* set target's background to pixmap */ 1540 /* set target's background to pixmap */
1564# ifdef ENABLE_TRANSPARENCY 1541# ifdef ENABLE_TRANSPARENCY
1565 if (flags & isTransparent) 1542 if (flags & isTransparent)
… …
1571 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1548 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1572 } 1549 }
1573 else 1550 else
1574# endif 1551# endif
1575 { 1552 {
1576 flags |= isVtOrigin;
1577 /* force old pixmap dereference in case it was transparent before :*/ 1553 /* force old pixmap dereference in case it was transparent before :*/
1578 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1554 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1579 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1555 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1580 /* do we also need to set scrollbar's background here ? */ 1556 /* do we also need to set scrollbar's background here ? */
1581 1557
… …
1608 } 1584 }
1609} 1585}
1610 1586
1611#endif /* HAVE_BG_PIXMAP */ 1587#endif /* HAVE_BG_PIXMAP */
1612 1588
1613#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1589#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1614/* taken from aterm-0.4.2 */ 1590/* taken from aterm-0.4.2 */
1615 1591
1616typedef uint32_t RUINT32T;
1617
1618static void 1592static void
1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1593ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1620{ 1594{
1621 int sh_r, sh_g, sh_b; 1595 int sh_r, sh_g, sh_b;
1622 RUINT32T mask_r, mask_g, mask_b; 1596 uint32_t mask_r, mask_g, mask_b;
1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1597 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1598 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1599 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1626 int i; 1600 int i;
1601 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1627 1602
1628 Visual *visual = term->visual;
1629
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1603 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1631 1604
1632 /* for convenience */ 1605 /* for convenience */
1633 mask_r = visual->red_mask; 1606 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1607 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1608 mask_b = visual->blue_mask;
1636 1609
1637 /* boring lookup table pre-initialization */ 1610 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1611 switch (srcImage->depth)
1612 {
1639 case 15: 1613 case 15:
1640 if ((mask_r != 0x7c00) || 1614 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1615 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1616 (mask_b != 0x001f))
1643 return; 1617 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1618 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1645 lookup_r = lookup; 1619 lookup_r = lookup;
1646 lookup_g = lookup+32; 1620 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1621 lookup_b = lookup+32+32;
1648 sh_r = 10; 1622 sh_r = 10;
1649 sh_g = 5; 1623 sh_g = 5;
1650 sh_b = 0; 1624 sh_b = 0;
1651 break; 1625 break;
1652 case 16: 1626 case 16:
1653 if ((mask_r != 0xf800) || 1627 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1628 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1629 (mask_b != 0x001f))
1656 return; 1630 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1631 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1658 lookup_r = lookup; 1632 lookup_r = lookup;
1659 lookup_g = lookup+32; 1633 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1634 lookup_b = lookup+32+64;
1661 sh_r = 11; 1635 sh_r = 11;
1662 sh_g = 5; 1636 sh_g = 5;
1663 sh_b = 0; 1637 sh_b = 0;
1664 break; 1638 break;
1665 case 24: 1639 case 24:
1666 if ((mask_r != 0xff0000) || 1640 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1641 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1642 (mask_b != 0x0000ff))
1669 return; 1643 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1644 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1671 lookup_r = lookup; 1645 lookup_r = lookup;
1672 lookup_g = lookup+256; 1646 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1647 lookup_b = lookup+256+256;
1674 sh_r = 16; 1648 sh_r = 16;
1675 sh_g = 8; 1649 sh_g = 8;
1676 sh_b = 0; 1650 sh_b = 0;
1677 break; 1651 break;
1678 case 32: 1652 case 32:
1679 if ((mask_r != 0xff0000) || 1653 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1654 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1655 (mask_b != 0x0000ff))
1682 return; 1656 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1657 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1684 lookup_r = lookup; 1658 lookup_r = lookup;
1685 lookup_g = lookup+256; 1659 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1660 lookup_b = lookup+256+256;
1687 sh_r = 16; 1661 sh_r = 16;
1688 sh_g = 8; 1662 sh_g = 8;
1689 sh_b = 0; 1663 sh_b = 0;
1690 break; 1664 break;
1691 default: 1665 default:
1692 return; /* we do not support this color depth */ 1666 return; /* we do not support this color depth */
1693 } 1667 }
1694 1668
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1669 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1670 if (shade > 100)
1671 {
1697 shade = 200 - shade; 1672 shade = 200 - shade;
1698 1673
1699 lower_lim_r = 65535-rm; 1674 lower_lim_r = 65535-rm;
1700 lower_lim_g = 65535-gm; 1675 lower_lim_g = 65535-gm;
1701 lower_lim_b = 65535-bm; 1676 lower_lim_b = 65535-bm;
1702 1677
1703 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1678 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1679 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1680 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1706 1681
1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1682 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1683 }
1708 } else { 1684 else
1685 {
1709 1686
1710 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1687 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1711 1688
1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1689 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1690 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1714 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1691 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1715 } 1692 }
1716
1717 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1718 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1719 {
1720 unsigned int tmp;
1721
1722 tmp = lower_lim_r;
1723 lower_lim_r = lower_lim_b;
1724 lower_lim_b = tmp;
1725
1726 tmp = upper_lim_r;
1727 upper_lim_r = upper_lim_b;
1728 upper_lim_b = tmp;
1729 }
1730 1693
1731 /* fill our lookup tables */ 1694 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1695 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1696 {
1734 RUINT32T tmp; 1697 uint32_t tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1698 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1699 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1700 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1701 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1702 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1703 {
1741 RUINT32T tmp; 1704 uint32_t tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1705 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1706 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1707 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1708 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1709 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1710 {
1748 RUINT32T tmp; 1711 uint32_t tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1712 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1713 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1714 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1715 }
1753 1716
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1717 /* apply table to input image (replacing colors by newly calculated ones) */
1755 switch (srcImage->bits_per_pixel) 1718 if (srcImage->bits_per_pixel == 32
1719 && (srcImage->depth == 24 || srcImage->depth == 32)
1720 && srcImage->byte_order == host_byte_order)
1756 { 1721 {
1757 case 15:
1758 {
1759 unsigned short *p1, *pf, *p, *pl; 1722 uint32_t *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1723 p1 = (uint32_t *) srcImage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1724 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1725
1762 while (p1 < pf) 1726 while (p1 < pf)
1763 { 1727 {
1764 p = p1; 1728 p = p1;
1765 pl = p1 + srcImage->width; 1729 pl = p1 + srcImage->width;
1766 for (; p < pl; p++) 1730 for (; p < pl; p++)
1767 { 1731 {
1768 *p = lookup_r[(*p & 0x7c00)>>10] |
1769 lookup_g[(*p & 0x03e0)>> 5] |
1770 lookup_b[(*p & 0x001f)];
1771 }
1772 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1773 }
1774 break;
1775 }
1776 case 16:
1777 {
1778 unsigned short *p1, *pf, *p, *pl;
1779 p1 = (unsigned short *) srcImage->data;
1780 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1781 while (p1 < pf)
1782 {
1783 p = p1;
1784 pl = p1 + srcImage->width;
1785 for (; p < pl; p++)
1786 {
1787 *p = lookup_r[(*p & 0xf800)>>11] |
1788 lookup_g[(*p & 0x07e0)>> 5] |
1789 lookup_b[(*p & 0x001f)];
1790 }
1791 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1792 }
1793 break;
1794 }
1795 case 24:
1796 {
1797 unsigned char *p1, *pf, *p, *pl;
1798 p1 = (unsigned char *) srcImage->data;
1799 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1800 while (p1 < pf)
1801 {
1802 p = p1;
1803 pl = p1 + srcImage->width * 3;
1804 for (; p < pl; p += 3)
1805 {
1806 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1807 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1808 p[2] = lookup_r[(p[2] & 0x0000ff)];
1809 }
1810 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1811 }
1812 break;
1813 }
1814 case 32:
1815 {
1816 RUINT32T *p1, *pf, *p, *pl;
1817 p1 = (RUINT32T *) srcImage->data;
1818 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1819
1820 while (p1 < pf)
1821 {
1822 p = p1;
1823 pl = p1 + srcImage->width;
1824 for (; p < pl; p++)
1825 {
1826 *p = lookup_r[(*p & 0xff0000)>>16] | 1732 *p = lookup_r[(*p & 0xff0000) >> 16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1733 lookup_g[(*p & 0x00ff00) >> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1734 lookup_b[(*p & 0x0000ff)] |
1829 (*p & ~0xffffff); 1735 (*p & 0xff000000);
1736 }
1737 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1738 }
1739 }
1740 else
1741 {
1742 for (int y = 0; y < srcImage->height; y++)
1743 for (int x = 0; x < srcImage->width; x++)
1744 {
1745 unsigned long pixel = XGetPixel (srcImage, x, y);
1746 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1747 lookup_g[(pixel & mask_g) >> sh_g] |
1748 lookup_b[(pixel & mask_b) >> sh_b];
1749 XPutPixel (srcImage, x, y, pixel);
1830 } 1750 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 1751 }
1833 break;
1834 }
1835 }
1836 1752
1837 free (lookup); 1753 free (lookup);
1838} 1754}
1839#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1755#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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