Mercurial > hg > xemacs-beta

comparison src/redisplay-output.c @ 863:42375619fa45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-04 06:03:59 by andyp] merge 21.4 windows changes, minimally tested
author andyp
date Tue, 04 Jun 2002 06:05:53 +0000
parents e7ee5f8bde58
children 804517e16990
comparison
equal deleted inserted replaced
862:278c743f1578 863:42375619fa45
1 /* Synchronize redisplay structures and output changes. 1 /* Synchronize redisplay structures and output changes.
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 1996, 2002 Ben Wing. 3 Copyright (C) 1995, 1996, 2002 Ben Wing.
4 Copyright (C) 1996 Chuck Thompson. 4 Copyright (C) 1996 Chuck Thompson.
5 Copyright (C) 1999 Andy Piper. 5 Copyright (C) 1999, 2002 Andy Piper.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
10 under the terms of the GNU General Public License as published by the 10 under the terms of the GNU General Public License as published by the
1430 if (!NILP (IMAGE_INSTANCE_LAYOUT_BORDER (p))) 1430 if (!NILP (IMAGE_INSTANCE_LAYOUT_BORDER (p)))
1431 { 1431 {
1432 int edges = 0; 1432 int edges = 0;
1433 enum edge_style style; 1433 enum edge_style style;
1434 int ypos = db->ypos; 1434 int ypos = db->ypos;
1435 int xpos = db->xpos;
1435 int height = dga->height; 1436 int height = dga->height;
1436 1437 int width = dga->width;
1437 if (dga->xoffset >= 0) 1438
1439 /* The bevel_area routines always draw in from the specified
1440 area so there is no need to adjust the displayed area to
1441 make sure that the lines are visible. */
1442 if (dga->xoffset >= 0)
1438 edges |= EDGE_LEFT; 1443 edges |= EDGE_LEFT;
1439 if (dga->width - dga->xoffset == layout_width) 1444 if (dga->width - dga->xoffset == layout_width)
1440 edges |= EDGE_RIGHT; 1445 edges |= EDGE_RIGHT;
1441 if (dga->yoffset >= 0) 1446 if (dga->yoffset >= 0)
1442 edges |= EDGE_TOP; 1447 edges |= EDGE_TOP;
1443 if (dga->height - dga->yoffset == layout_height) 1448 if (dga->height - dga->yoffset == layout_height)
1444 edges |= EDGE_BOTTOM; 1449 edges |= EDGE_BOTTOM;
1445 1450
1446 if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_in)) 1451 if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_in))
1447 style = EDGE_ETCHED_IN; 1452 style = EDGE_ETCHED_IN;
1448 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_out)) 1453 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_out))
1449 style = EDGE_ETCHED_OUT; 1454 style = EDGE_ETCHED_OUT;
1450 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qbevel_in)) 1455 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qbevel_in))
1460 } 1465 }
1461 else 1466 else
1462 style = EDGE_BEVEL_OUT; 1467 style = EDGE_BEVEL_OUT;
1463 1468
1464 MAYBE_DEVMETH (d, bevel_area, 1469 MAYBE_DEVMETH (d, bevel_area,
1465 (w, findex, db->xpos, 1470 (w, findex, xpos, ypos, width, height,
1466 ypos, 1471 DEFAULT_WIDGET_SHADOW_WIDTH, edges, style));
1467 dga->width, height, 2, edges, style));
1468 } 1472 }
1469 } 1473 }
1470 1474
1471 /* This shrinks the display box to exactly enclose the glyph 1475 /* This shrinks the display box to exactly enclose the glyph
1472 area. */ 1476 area. */