Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 284:558f606b08ae r21-0b40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b40
author cvs
date Mon, 13 Aug 2007 10:34:13 +0200
parents c42ec1d1cded
children e11d67e05968
comparison
equal deleted inserted replaced
283:fa3d41851a08 284:558f606b08ae
487 { 487 {
488 visual = DefaultVisual(dpy, screen); 488 visual = DefaultVisual(dpy, screen);
489 depth = DefaultDepth(dpy, screen); 489 depth = DefaultDepth(dpy, screen);
490 } 490 }
491 491
492 /* If we've got the same visual as the default and its PseudoColor, check to see if the user 492 /* If we've got the same visual as the default and it's PseudoColor,
493 specified that we need a private colormap */ 493 check to see if the user specified that we need a private colormap */
494 if (visual == DefaultVisual(dpy, screen)) 494 if (visual == DefaultVisual(dpy, screen))
495 { 495 {
496 sprintf (buf1, "%s.privateColormap", app_name); 496 sprintf (buf1, "%s.privateColormap", app_name);
497 sprintf (buf2, "%s.PrivateColormap", app_class); 497 sprintf (buf2, "%s.PrivateColormap", app_class);
498 if ((visual->class == PseudoColor) && 498 if ((visual->class == PseudoColor) &&
1401 { 1401 {
1402 Display *dpy = DEVICE_X_DISPLAY (d); 1402 Display *dpy = DEVICE_X_DISPLAY (d);
1403 1403
1404 switch (m) 1404 switch (m)
1405 { 1405 {
1406 case size_device: 1406 case DM_size_device:
1407 return Fcons (make_int (DisplayWidth (dpy, DefaultScreen (dpy))), 1407 return Fcons (make_int (DisplayWidth (dpy, DefaultScreen (dpy))),
1408 make_int (DisplayHeight (dpy, DefaultScreen (dpy)))); 1408 make_int (DisplayHeight (dpy, DefaultScreen (dpy))));
1409 break; 1409 break;
1410 case size_device_mm: 1410 case DM_size_device_mm:
1411 return Fcons (make_int (DisplayWidthMM (dpy, DefaultScreen (dpy))), 1411 return Fcons (make_int (DisplayWidthMM (dpy, DefaultScreen (dpy))),
1412 make_int (DisplayHeightMM (dpy, DefaultScreen (dpy)))); 1412 make_int (DisplayHeightMM (dpy, DefaultScreen (dpy))));
1413 break; 1413 break;
1414 case num_bit_planes: 1414 case DM_num_bit_planes:
1415 return make_int (DisplayPlanes (dpy, DefaultScreen (dpy))); 1415 return make_int (DisplayPlanes (dpy, DefaultScreen (dpy)));
1416 break; 1416 break;
1417 case num_color_cells: 1417 case DM_num_color_cells:
1418 return make_int (DisplayCells (dpy, DefaultScreen (dpy))); 1418 return make_int (DisplayCells (dpy, DefaultScreen (dpy)));
1419 break; 1419 break;
1420 } 1420 }
1421 1421
1422 /* Do not know such property */ 1422 /* Do not know such property */
1423 return Qnil; 1423 return Qunbound;
1424 } 1424 }
1425 1425
1426 DEFUN ("x-server-vendor", Fx_server_vendor, 0, 1, 0, /* 1426 DEFUN ("x-server-vendor", Fx_server_vendor, 0, 1, 0, /*
1427 Return the vendor ID string of the X server `device' on. 1427 Return the vendor ID string of the X server `device' on.
1428 */ 1428 */