comparison src/redisplay-x.c @ 282:c42ec1d1cded r21-0b39

Import from CVS: tag r21-0b39
author cvs
date Mon, 13 Aug 2007 10:33:18 +0200
parents c5d627a313b1
children 558f606b08ae
comparison
equal deleted inserted replaced
281:090b52736db2 282:c42ec1d1cded
1406 int modeline_height = window_modeline_height (w); 1406 int modeline_height = window_modeline_height (w);
1407 int x1, x2; 1407 int x1, x2;
1408 int y1, y2; 1408 int y1, y2;
1409 1409
1410 #ifdef HAVE_SCROLLBARS 1410 #ifdef HAVE_SCROLLBARS
1411 if (f->scrollbar_on_left) 1411 if (!NILP (w->scrollbar_on_left_p))
1412 #endif 1412 #endif
1413 x1 = WINDOW_LEFT (w); 1413 x1 = WINDOW_LEFT (w);
1414 #ifdef HAVE_SCROLLBARS 1414 #ifdef HAVE_SCROLLBARS
1415 else 1415 else
1416 x1 = WINDOW_RIGHT (w) - X_DIVIDER_WIDTH; 1416 x1 = WINDOW_RIGHT (w) - X_DIVIDER_WIDTH;
1417 #endif 1417 #endif
1418 x2 = x1 + X_DIVIDER_SPACING; 1418 x2 = x1 + X_DIVIDER_SPACING;
1419 1419
1420 #ifdef HAVE_SCROLLBARS 1420 #ifdef HAVE_SCROLLBARS
1421 if (f->scrollbar_on_top) 1421 if (!NILP (w->scrollbar_on_top_p))
1422 y1 = WINDOW_TOP (w); 1422 y1 = WINDOW_TOP (w);
1423 else 1423 else
1424 #endif 1424 #endif
1425 y1 = WINDOW_TEXT_TOP (w); 1425 y1 = WINDOW_TEXT_TOP (w);
1426 y2 = WINDOW_BOTTOM (w) - modeline_height; 1426 y2 = WINDOW_BOTTOM (w) - modeline_height;