summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/tkMacOSXXStubs.c16
-rw-r--r--win/tkWinPixmap.c2
-rw-r--r--win/tkWinPointer.c23
-rw-r--r--win/tkWinWindow.c2
-rw-r--r--win/tkWinWm.c10
-rw-r--r--win/tkWinX.c96
-rw-r--r--xlib/xutil.c6
7 files changed, 72 insertions, 83 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index a3dc830..6297e1f 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -91,11 +91,11 @@ TkMacOSXDisplayChanged(
NSRect bounds = [s frame];
NSRect maxBounds = NSZeroRect;
- screen->root_depth = NSBitsPerPixelFromDepth([s depth]);
- screen->width = bounds.size.width;
- screen->height = bounds.size.height;
- screen->mwidth = (bounds.size.width * 254 + 360) / 720;
- screen->mheight = (bounds.size.height * 254 + 360) / 720;
+ DefaultDepthOfScreen(screen) = NSBitsPerPixelFromDepth([s depth]);
+ WidthOfScreen(screen) = bounds.size.width;
+ HeightOfScreen(screen) = bounds.size.height;
+ WidthMMOfScreen(screen) = (bounds.size.width * 254 + 360) / 720;
+ HeightMMOfScreen(screen) = (bounds.size.height * 254 + 360) / 720;
for (s in nsScreens) {
maxBounds = NSUnionRect(maxBounds, [s visibleFrame]);
@@ -244,7 +244,7 @@ XkbOpenDisplay(
bzero(screen, sizeof(Screen));
display->resource_alloc = MacXIdAlloc;
- display->request = 1;
+ LastKnownRequestProcessed(display) = 1;
display->qlen = 0;
display->fd = fd;
display->screens = screen;
@@ -338,8 +338,8 @@ TkpCloseDisplay(
gMacDisplay = NULL;
if (display->screens != NULL) {
- if (ScreenOfDisplay(display, 0)->root_visual != NULL) {
- ckfree(ScreenOfDisplay(display, 0)->root_visual);
+ if (DefaultVisualOfScreen(ScreenOfDisplay(display, 0)) != NULL) {
+ ckfree(DefaultVisualOfScreen(ScreenOfDisplay(display, 0)));
}
ckfree(display->screens);
}
diff --git a/win/tkWinPixmap.c b/win/tkWinPixmap.c
index 0bba4c3..c785367 100644
--- a/win/tkWinPixmap.c
+++ b/win/tkWinPixmap.c
@@ -58,7 +58,7 @@ Tk_GetPixmap(
}
screen = ScreenOfDisplay(display, 0);
planes = 1;
- if (depth == screen->root_depth) {
+ if (depth == DefaultDepthOfScreen(screen)) {
planes = PTR2INT(screen->ext_data);
depth /= planes;
}
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index 200a868..6736ff0 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -324,21 +324,15 @@ TkGetPointerCoords(
Bool
XQueryPointer(
Display *display,
- Window w,
- Window *root_return,
- Window *child_return,
+ TCL_UNUSED(Window),
+ TCL_UNUSED(Window *),
+ TCL_UNUSED(Window *),
int *root_x_return,
int *root_y_return,
- int *win_x_return,
- int *win_y_return,
+ TCL_UNUSED(int *),
+ TCL_UNUSED(int *),
unsigned int *mask_return)
{
- (void)w;
- (void)root_return;
- (void)child_return;
- (void)win_x_return;
- (void)win_y_return;
-
LastKnownRequestProcessed(display)++;
TkGetPointerCoords(NULL, root_x_return, root_y_return);
*mask_return = TkWinGetModifierState();
@@ -501,12 +495,9 @@ int
XSetInputFocus(
Display *display,
Window focus,
- int revert_to,
- Time time)
+ TCL_UNUSED(int),
+ TCL_UNUSED(Time))
{
- (void)revert_to;
- (void)time;
-
LastKnownRequestProcessed(display)++;
if (focus != None) {
SetFocus(Tk_GetHWND(focus));
diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index 8390ec0..42b0853 100644
--- a/win/tkWinWindow.c
+++ b/win/tkWinWindow.c
@@ -704,7 +704,7 @@ XClearWindow(
HWND hwnd = Tk_GetHWND(w);
HDC dc = GetDC(hwnd);
- palette = TkWinGetPalette(ScreenOfDisplay(display, 0)->cmap);
+ palette = TkWinGetPalette(DefaultColormapOfScreen(ScreenOfDisplay(display, 0)));
oldPalette = SelectPalette(dc, palette, FALSE);
LastKnownRequestProcessed(display)++;
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index b257848..8196eb3 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -7833,7 +7833,7 @@ WmProc(
winPtr = GetTopLevel(hwnd);
if (winPtr) {
Screen *screen = Tk_Screen(winPtr);
- if (screen->root_depth != (int) wParam) {
+ if (DefaultDepthOfScreen(screen) != (int) wParam) {
/*
* Color resolution changed, so do extensive rebuild of
* display parameters. This will affect the display for all Tk
@@ -7846,11 +7846,11 @@ WmProc(
} else {
HDC dc = GetDC(NULL);
- screen->width = LOWORD(lParam); /* horizontal res */
- screen->height = HIWORD(lParam); /* vertical res */
- screen->mwidth = MulDiv(screen->width, 254,
+ WidthOfScreen(screen) = LOWORD(lParam); /* horizontal res */
+ HeightOfScreen(screen) = HIWORD(lParam); /* vertical res */
+ WidthMMOfScreen(screen) = MulDiv(WidthOfScreen(screen), 254,
GetDeviceCaps(dc, LOGPIXELSX) * 10);
- screen->mheight = MulDiv(screen->height, 254,
+ HeightMMOfScreen(screen) = MulDiv(HeightOfScreen(screen), 254,
GetDeviceCaps(dc, LOGPIXELSY) * 10);
ReleaseDC(NULL, dc);
}
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 5e26822..a00d794 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -429,11 +429,11 @@ TkWinDisplayChanged(
screen = (((_XPrivDisplay)(display))->screens);
dc = GetDC(NULL);
- screen->width = GetDeviceCaps(dc, HORZRES);
- screen->height = GetDeviceCaps(dc, VERTRES);
- screen->mwidth = MulDiv(screen->width, 254,
+ WidthOfScreen(screen) = GetDeviceCaps(dc, HORZRES);
+ HeightOfScreen(screen) = GetDeviceCaps(dc, VERTRES);
+ WidthMMOfScreen(screen) = MulDiv(WidthOfScreen(screen), 254,
GetDeviceCaps(dc, LOGPIXELSX) * 10);
- screen->mheight = MulDiv(screen->height, 254,
+ HeightMMOfScreen(screen) = MulDiv(HeightOfScreen(screen), 254,
GetDeviceCaps(dc, LOGPIXELSY) * 10);
/*
@@ -454,43 +454,43 @@ TkWinDisplayChanged(
screen->root_visual = (Visual *)ckalloc(sizeof(Visual));
screen->root_visual->visualid = 0;
if (GetDeviceCaps(dc, RASTERCAPS) & RC_PALETTE) {
- screen->root_visual->map_entries = GetDeviceCaps(dc, SIZEPALETTE);
- screen->root_visual->c_class = PseudoColor;
- screen->root_visual->red_mask = 0x0;
- screen->root_visual->green_mask = 0x0;
- screen->root_visual->blue_mask = 0x0;
- } else if (screen->root_depth == 4) {
- screen->root_visual->c_class = StaticColor;
- screen->root_visual->map_entries = 16;
- } else if (screen->root_depth == 8) {
- screen->root_visual->c_class = StaticColor;
- screen->root_visual->map_entries = 256;
- } else if (screen->root_depth == 12) {
- screen->root_visual->c_class = TrueColor;
- screen->root_visual->map_entries = 32;
- screen->root_visual->red_mask = 0xf0;
- screen->root_visual->green_mask = 0xf000;
- screen->root_visual->blue_mask = 0xf00000;
- } else if (screen->root_depth == 16) {
- screen->root_visual->c_class = TrueColor;
- screen->root_visual->map_entries = 64;
- screen->root_visual->red_mask = 0xf8;
- screen->root_visual->green_mask = 0xfc00;
- screen->root_visual->blue_mask = 0xf80000;
- } else if (screen->root_depth >= 24) {
- screen->root_visual->c_class = TrueColor;
- screen->root_visual->map_entries = 256;
- screen->root_visual->red_mask = 0xff;
- screen->root_visual->green_mask = 0xff00;
- screen->root_visual->blue_mask = 0xff0000;
+ DefaultVisualOfScreen(screen)->map_entries = GetDeviceCaps(dc, SIZEPALETTE);
+ DefaultVisualOfScreen(screen)->c_class = PseudoColor;
+ DefaultVisualOfScreen(screen)->red_mask = 0x0;
+ DefaultVisualOfScreen(screen)->green_mask = 0x0;
+ DefaultVisualOfScreen(screen)->blue_mask = 0x0;
+ } else if (DefaultDepthOfScreen(screen) == 4) {
+ DefaultVisualOfScreen(screen)->c_class = StaticColor;
+ DefaultVisualOfScreen(screen)->map_entries = 16;
+ } else if (DefaultDepthOfScreen(screen) == 8) {
+ DefaultVisualOfScreen(screen)->c_class = StaticColor;
+ DefaultVisualOfScreen(screen)->map_entries = 256;
+ } else if (DefaultDepthOfScreen(screen) == 12) {
+ DefaultVisualOfScreen(screen)->c_class = TrueColor;
+ DefaultVisualOfScreen(screen)->map_entries = 32;
+ DefaultVisualOfScreen(screen)->red_mask = 0xf0;
+ DefaultVisualOfScreen(screen)->green_mask = 0xf000;
+ DefaultVisualOfScreen(screen)->blue_mask = 0xf00000;
+ } else if (DefaultDepthOfScreen(screen) == 16) {
+ DefaultVisualOfScreen(screen)->c_class = TrueColor;
+ DefaultVisualOfScreen(screen)->map_entries = 64;
+ DefaultVisualOfScreen(screen)->red_mask = 0xf8;
+ DefaultVisualOfScreen(screen)->green_mask = 0xfc00;
+ DefaultVisualOfScreen(screen)->blue_mask = 0xf80000;
+ } else if (DefaultDepthOfScreen(screen) >= 24) {
+ DefaultVisualOfScreen(screen)->c_class = TrueColor;
+ DefaultVisualOfScreen(screen)->map_entries = 256;
+ DefaultVisualOfScreen(screen)->red_mask = 0xff;
+ DefaultVisualOfScreen(screen)->green_mask = 0xff00;
+ DefaultVisualOfScreen(screen)->blue_mask = 0xff0000;
}
- screen->root_visual->bits_per_rgb = screen->root_depth;
+ DefaultVisualOfScreen(screen)->bits_per_rgb = DefaultDepthOfScreen(screen);
ReleaseDC(NULL, dc);
- if (screen->cmap != None) {
- XFreeColormap(display, screen->cmap);
+ if (DefaultColormapOfScreen(screen) != None) {
+ XFreeColormap(display, DefaultColormapOfScreen(screen));
}
- screen->cmap = XCreateColormap(display, None, screen->root_visual,
+ DefaultColormapOfScreen(screen) = XCreateColormap(display, None, DefaultVisualOfScreen(screen),
AllocNone);
}
@@ -571,9 +571,9 @@ XkbOpenDisplay(
* Note that these pixel values are not palette relative.
*/
- screen->white_pixel = RGB(255, 255, 255);
- screen->black_pixel = RGB(0, 0, 0);
- screen->cmap = None;
+ WhitePixelOfScreen(screen) = RGB(255, 255, 255);
+ BlackPixelOfScreen(screen) = RGB(0, 0, 0);
+ DefaultColormapOfScreen(screen) = None;
display->screens = screen;
display->nscreens = 1;
@@ -636,17 +636,17 @@ TkpCloseDisplay(
if (display->display_name != NULL) {
ckfree(display->display_name);
}
- if (display->screens != NULL) {
- if (ScreenOfDisplay(display, 0)->root_visual != NULL) {
- ckfree(ScreenOfDisplay(display, 0)->root_visual);
+ if (ScreenOfDisplay(display, 0) != NULL) {
+ if (DefaultVisualOfScreen(ScreenOfDisplay(display, 0)) != NULL) {
+ ckfree(DefaultVisualOfScreen(ScreenOfDisplay(display, 0)));
}
- if (ScreenOfDisplay(display, 0)->root != None) {
- ckfree((char *)ScreenOfDisplay(display, 0)->root);
+ if (RootWindowOfScreen(ScreenOfDisplay(display, 0)) != None) {
+ ckfree(RootWindowOfScreen(ScreenOfDisplay(display, 0)));
}
- if (ScreenOfDisplay(display, 0)->cmap != None) {
- XFreeColormap((Display *)display, ScreenOfDisplay(display, 0)->cmap);
+ if (DefaultColormapOfScreen(ScreenOfDisplay(display, 0)) != None) {
+ XFreeColormap(display, DefaultColormapOfScreen(ScreenOfDisplay(display, 0)));
}
- ckfree(display->screens);
+ ckfree(ScreenOfDisplay(display, 0));
}
ckfree(display);
}
diff --git a/xlib/xutil.c b/xlib/xutil.c
index 0760dc6..3654fcd 100644
--- a/xlib/xutil.c
+++ b/xlib/xutil.c
@@ -32,12 +32,10 @@
Atom
XInternAtom(
Display *display,
- _Xconst char *atom_name,
- Bool only_if_exists)
+ TCL_UNUSED(_Xconst char *),
+ TCL_UNUSED(Bool))
{
static Atom atom = XA_LAST_PREDEFINED;
- (void)atom_name;
- (void)only_if_exists;
LastKnownRequestProcessed(display)++;
return ++atom;
generated by cgit v0.12 at 2024-09-20 04:01:48 (GMT)