X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2Fjwxyz.h;h=966a40fae58bc44ef749a5fce8d9ee10c1d91681;hb=f0261d8acab611f3433160e4f07367b870439739;hp=35e7f5572b56beefaf9006bfaf8f509aef895a3c;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/OSX/jwxyz.h b/OSX/jwxyz.h
index 35e7f557..966a40fa 100644
--- a/OSX/jwxyz.h
+++ b/OSX/jwxyz.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1991-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2009 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -231,6 +231,7 @@ typedef void *				XtPointer;
 #define RootWindowOfScreen(s) RootWindow(DisplayOfScreen(s),0)
 #define DisplayWidth XDisplayWidth
 #define DisplayHeight XDisplayHeight
+#define XMaxRequestSize(dpy) (65535)
 
 extern Display *jwxyz_make_display (void *nsview);
 extern void jwxyz_free_display (Display *);
@@ -357,7 +358,7 @@ extern Pixmap XCreatePixmapFromBitmapData (Display *, Drawable,
 extern XPixmapFormatValues *XListPixmapFormats (Display *, int *count_ret);
 
 extern void jwxyz_draw_NSImage (Display *, Drawable, void *NSImage_arg,
-                                XRectangle *geom_ret);
+                                XRectangle *geom_ret, int exif_rotation);
 
 extern int XSetGraphicsExposures (Display *, GC, Bool);
 extern Bool XTranslateCoordinates (Display *, Window src_w, Window dest_w,
@@ -376,7 +377,6 @@ extern int XTextExtents (XFontStruct *, const char *, int length,
                          XCharStruct *overall_ret);
 extern int XTextWidth (XFontStruct *, const char *, int length);
 extern int XSetFont (Display *, GC, Font);
-extern Font XGContextFromGC (GC);
 
 extern Pixmap XCreatePixmap (Display *, Drawable,
                              unsigned int width, unsigned int height,
@@ -409,10 +409,6 @@ extern int visual_class (Screen *, Visual *);
 // also declared in utils/grabclient.h
 extern Bool use_subwindow_mode_p (Screen *, Window);
 
-// for aglUseFont
-extern int jwxyz_font_info (Font, int *size_ret, int *face_ret);
-
-
 struct jwxyz_Visual {
   VisualID visualid;	/* visual id of this visual */
   int class;		/* class of screen (monochrome, etc.) */