projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz
[xscreensaver]
/
hacks
/
analogtv.h
diff --git
a/hacks/analogtv.h
b/hacks/analogtv.h
index 92d9b8e69605909d3b359b44e30a87d917c1e2e1..ed3ce340bb184362b3da02f433fef405daa227f4 100644
(file)
--- a/
hacks/analogtv.h
+++ b/
hacks/analogtv.h
@@
-1,4
+1,4
@@
-/* analogtv, Copyright (c) 2003
, 2004
Trevor Blackwell <tlb@tlb.org>
+/* analogtv, Copyright (c) 2003
-2016
Trevor Blackwell <tlb@tlb.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-15,6
+15,10
@@
#include "thread_util.h"
#include "xshm.h"
#include "thread_util.h"
#include "xshm.h"
+#if defined(USE_IPHONE) || defined(HAVE_ANDROID)
+# define HAVE_MOBILE
+#endif
+
/*
You'll need these to generate standard NTSC TV signals
*/
/*
You'll need these to generate standard NTSC TV signals
*/
@@
-157,17
+161,15
@@
typedef struct analogtv_s {
int fakeit_scroll;
int redraw_all;
int fakeit_scroll;
int redraw_all;
- int use_
shm,use_
cmap,use_color;
+ int use_cmap,use_color;
int bilevel_signal;
int bilevel_signal;
-#ifdef HAVE_XSHM_EXTENSION
XShmSegmentInfo shm_info;
XShmSegmentInfo shm_info;
-#endif
int visdepth,visclass,visbits;
int red_invprec, red_shift;
int green_invprec, green_shift;
int blue_invprec, blue_shift;
int visdepth,visclass,visbits;
int red_invprec, red_shift;
int green_invprec, green_shift;
int blue_invprec, blue_shift;
- unsigned
int
red_mask, green_mask, blue_mask;
+ unsigned
long
red_mask, green_mask, blue_mask;
Colormap colormap;
int usewidth,useheight,xrepl,subwidth;
Colormap colormap;
int usewidth,useheight,xrepl,subwidth;
@@
-294,13
+296,13
@@
int analogtv_handle_events (analogtv *it);
#define ANALOGTV_DEFAULTS_SHM
#endif
#define ANALOGTV_DEFAULTS_SHM
#endif
-#ifndef
USE_IPHON
E
+#ifndef
HAVE_MOBIL
E
# define ANALOGTV_DEF_BRIGHTNESS "2"
# define ANALOGTV_DEF_CONTRAST "150"
#else
/* Need to really crank this up for it to look good on the iPhone screen. */
# define ANALOGTV_DEF_BRIGHTNESS "3"
# define ANALOGTV_DEF_BRIGHTNESS "2"
# define ANALOGTV_DEF_CONTRAST "150"
#else
/* Need to really crank this up for it to look good on the iPhone screen. */
# define ANALOGTV_DEF_BRIGHTNESS "3"
-# define ANALOGTV_DEF_CONTRAST "
10
00"
+# define ANALOGTV_DEF_CONTRAST "
4
00"
#endif
#define ANALOGTV_DEFAULTS \
#endif
#define ANALOGTV_DEFAULTS \