| 22 |
|
#include <X11/StringDefs.h> |
| 23 |
|
#include <X11/Intrinsic.h> |
| 24 |
|
#include <X11/Shell.h> |
| 25 |
+ |
#include <X11/cursorfont.h> |
| 26 |
|
#include <X11/Xaw/Simple.h> |
| 27 |
|
#include <X11/extensions/XShm.h> |
| 28 |
|
#include <X11/extensions/Xv.h> |
| 32 |
|
|
| 33 |
|
const int PAL_WIDTH = 384; |
| 34 |
|
const int PAL_HEIGHT = 288; |
| 35 |
< |
const int NTSC_WIDTH = 320; |
| 35 |
> |
const int NTSC_WIDTH = 360; |
| 36 |
|
const int NTSC_HEIGHT = 240; |
| 37 |
|
|
| 38 |
< |
static int grab_width, grab_height; |
| 38 |
> |
static int grab_width = -1, grab_height; |
| 39 |
|
static int image_width, image_height; |
| 40 |
|
static int win_width, win_height; |
| 41 |
|
|
| 42 |
< |
const int PAL_FPS = 50; |
| 43 |
< |
const int NTSC_FPS = 60; |
| 42 |
> |
const double PAL_FPS = 50.0; |
| 43 |
> |
const double NTSC_FPS = 59.94; |
| 44 |
|
|
| 45 |
< |
static int fps; |
| 45 |
> |
static double fps; |
| 46 |
|
|
| 47 |
|
static int brightness = 50, contrast = 50, color = 50; |
| 48 |
|
|
| 285 |
|
|
| 286 |
|
now = GetTicks_usec(); |
| 287 |
|
uint64 elapsed = now - prev; |
| 288 |
< |
int64 delay = 1000000 / fps - (now - prev); |
| 288 |
> |
int64 delay = int64(1000000.0 / fps) - (now - prev); |
| 289 |
|
#if LOGGING |
| 290 |
|
fprintf(log, "elapsed %Ld usec, delay %Ld usec\n", elapsed, delay); |
| 291 |
|
#endif |
| 322 |
|
{"help", 0, 0, 'h'}, |
| 323 |
|
{"ntsc", 0, 0, 'n'}, |
| 324 |
|
{"port", 1, 0, 'p'}, |
| 325 |
+ |
{"width", 1, 0, 'w'}, |
| 326 |
|
{NULL, 0, 0, 0} |
| 327 |
|
}; |
| 328 |
|
|
| 333 |
|
// Parse options |
| 334 |
|
for (;;) { |
| 335 |
|
int c; |
| 336 |
< |
if ((c = getopt_long(argc, argv, "hnp:", long_opts,NULL)) == -1) |
| 336 |
> |
if ((c = getopt_long(argc, argv, "hnp:w:", long_opts,NULL)) == -1) |
| 337 |
|
break; |
| 338 |
|
|
| 339 |
|
switch (c) { |
| 345 |
|
case 'p': |
| 346 |
|
port = atoi(optarg); |
| 347 |
|
break; |
| 348 |
+ |
case 'w': |
| 349 |
+ |
grab_width = atoi(optarg); |
| 350 |
+ |
break; |
| 351 |
|
case 'h': |
| 352 |
|
default: |
| 353 |
|
fprintf(stderr, |
| 354 |
|
"50/60Hz video display application\n\n" |
| 355 |
|
"Options:\n" |
| 356 |
< |
" -h | --help this text\n" |
| 357 |
< |
" -n | --ntsc NTSC mode\n" |
| 358 |
< |
" -p | --port n Xv output port\n\n" |
| 356 |
> |
" -h | --help this text\n" |
| 357 |
> |
" -n | --ntsc NTSC mode\n" |
| 358 |
> |
" -p | --port n Xv output port\n" |
| 359 |
> |
" -w | --width n image width\n\n" |
| 360 |
|
"Keyboard commands:\n" |
| 361 |
|
" q quit\n" |
| 362 |
|
" 1/2 select channel\n" |
| 377 |
|
XtOverrideTranslations(app_shell, XtParseTranslationTable( |
| 378 |
|
"<Message>WM_PROTOCOLS: quit()\n" |
| 379 |
|
"<Key>q: quit()\n" |
| 380 |
+ |
"<Key>Escape: quit()\n" |
| 381 |
|
"<Key>1: select_channel_1()\n" |
| 382 |
|
"<Key>2: select_channel_2()\n" |
| 383 |
|
"<Key>KP_7: inc_brightness()\n" |
| 438 |
|
|
| 439 |
|
// Set grab and window dimensions |
| 440 |
|
if (ntsc) { |
| 441 |
< |
grab_width = NTSC_WIDTH; |
| 441 |
> |
if (grab_width == -1) |
| 442 |
> |
grab_width = NTSC_WIDTH; |
| 443 |
|
grab_height = NTSC_HEIGHT; |
| 444 |
|
fps = NTSC_FPS; |
| 445 |
|
} else { |
| 446 |
< |
grab_width = PAL_WIDTH; |
| 446 |
> |
if (grab_width == -1) |
| 447 |
> |
grab_width = PAL_WIDTH; |
| 448 |
|
grab_height = PAL_HEIGHT; |
| 449 |
|
fps = PAL_FPS; |
| 450 |
|
} |
| 463 |
|
NULL |
| 464 |
|
); |
| 465 |
|
XtRealizeWidget(app_shell); |
| 466 |
+ |
Cursor null_cursor = XCreateFontCursor(dpy, XC_left_ptr); |
| 467 |
+ |
XDefineCursor(dpy, XtWindow(app_shell), null_cursor); |
| 468 |
|
XtVaSetValues(app_shell, |
| 469 |
|
XtNtitle, "mintv", |
| 470 |
+ |
XtNinput, True, |
| 471 |
|
NULL |
| 472 |
|
); |
| 473 |
< |
XSetWMProtocols(XtDisplay(app_shell), XtWindow(app_shell), &wm, 1); |
| 473 |
> |
XSetWMProtocols(dpy, XtWindow(app_shell), &wm, 1); |
| 474 |
|
gc = XCreateGC(dpy, XtWindow(video), 0, NULL); |
| 475 |
|
|
| 476 |
|
// Set image format |
