| 525 |
|
static int display_type; |
| 526 |
|
static int dis_width, dis_height; |
| 527 |
|
|
| 528 |
+ |
#if ENABLE_FBDEV_DGA |
| 529 |
+ |
static GtkWidget *w_fbdev_name, *w_fbdevice_file; |
| 530 |
+ |
static GtkWidget *l_fbdev_name, *l_fbdevice_file; |
| 531 |
+ |
static char fbdev_name[256]; |
| 532 |
+ |
#endif |
| 533 |
+ |
|
| 534 |
|
// Hide/show graphics widgets |
| 535 |
|
static void hide_show_graphics_widgets(void) |
| 536 |
|
{ |
| 537 |
|
switch (display_type) { |
| 538 |
|
case DISPLAY_WINDOW: |
| 539 |
|
gtk_widget_show(w_frameskip); gtk_widget_show(l_frameskip); |
| 540 |
+ |
#if ENABLE_FBDEV_DGA |
| 541 |
+ |
gtk_widget_show(w_display_x); gtk_widget_show(l_display_x); |
| 542 |
+ |
gtk_widget_show(w_display_y); gtk_widget_show(l_display_y); |
| 543 |
+ |
gtk_widget_hide(w_fbdev_name); gtk_widget_hide(l_fbdev_name); |
| 544 |
+ |
#endif |
| 545 |
|
break; |
| 546 |
|
case DISPLAY_SCREEN: |
| 547 |
|
gtk_widget_hide(w_frameskip); gtk_widget_hide(l_frameskip); |
| 548 |
+ |
#if ENABLE_FBDEV_DGA |
| 549 |
+ |
gtk_widget_hide(w_display_x); gtk_widget_hide(l_display_x); |
| 550 |
+ |
gtk_widget_hide(w_display_y); gtk_widget_hide(l_display_y); |
| 551 |
+ |
gtk_widget_show(w_fbdev_name); gtk_widget_show(l_fbdev_name); |
| 552 |
+ |
#endif |
| 553 |
|
break; |
| 554 |
|
} |
| 555 |
|
} |
| 588 |
|
display_type = DISPLAY_WINDOW; |
| 589 |
|
dis_width = 512; |
| 590 |
|
dis_height = 384; |
| 591 |
+ |
#if ENABLE_FBDEV_DGA |
| 592 |
+ |
fbdev_name[0] = 0; |
| 593 |
+ |
#endif |
| 594 |
|
|
| 595 |
|
const char *str = PrefsFindString("screen"); |
| 596 |
|
if (str) { |
| 597 |
|
if (sscanf(str, "win/%d/%d", &dis_width, &dis_height) == 2) |
| 598 |
|
display_type = DISPLAY_WINDOW; |
| 599 |
+ |
#if ENABLE_FBDEV_DGA |
| 600 |
+ |
else if (sscanf(str, "dga/%255s", fbdev_name) == 1) |
| 601 |
+ |
#else |
| 602 |
|
else if (sscanf(str, "dga/%d/%d", &dis_width, &dis_height) == 2) |
| 603 |
+ |
#endif |
| 604 |
|
display_type = DISPLAY_SCREEN; |
| 605 |
|
} |
| 606 |
|
} |
| 622 |
|
sprintf(pref, "win/%d/%d", dis_width, dis_height); |
| 623 |
|
break; |
| 624 |
|
case DISPLAY_SCREEN: |
| 625 |
+ |
#if ENABLE_FBDEV_DGA |
| 626 |
+ |
str = gtk_entry_get_text(GTK_ENTRY(w_fbdev_name)); |
| 627 |
+ |
sprintf(pref, "dga/%s", str); |
| 628 |
+ |
#else |
| 629 |
|
sprintf(pref, "dga/%d/%d", dis_width, dis_height); |
| 630 |
+ |
#endif |
| 631 |
|
break; |
| 632 |
|
default: |
| 633 |
|
PrefsRemoveItem("screen"); |
| 645 |
|
parse_graphics_prefs(); |
| 646 |
|
|
| 647 |
|
box = make_pane(top, STR_GRAPHICS_SOUND_PANE_TITLE); |
| 648 |
< |
table = make_table(box, 2, 4); |
| 648 |
> |
table = make_table(box, 2, 5); |
| 649 |
|
|
| 650 |
|
label = gtk_label_new(GetString(STR_VIDEO_TYPE_CTRL)); |
| 651 |
|
gtk_widget_show(label); |
| 746 |
|
gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4); |
| 747 |
|
w_display_y = GTK_COMBO(combo)->entry; |
| 748 |
|
|
| 749 |
+ |
#if ENABLE_FBDEV_DGA |
| 750 |
+ |
l_fbdev_name = gtk_label_new(GetString(STR_FBDEV_NAME_CTRL)); |
| 751 |
+ |
gtk_widget_show(l_fbdev_name); |
| 752 |
+ |
gtk_table_attach(GTK_TABLE(table), l_fbdev_name, 0, 1, 4, 5, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); |
| 753 |
+ |
|
| 754 |
+ |
w_fbdev_name = gtk_entry_new(); |
| 755 |
+ |
gtk_widget_show(w_fbdev_name); |
| 756 |
+ |
gtk_entry_set_text(GTK_ENTRY(w_fbdev_name), fbdev_name); |
| 757 |
+ |
gtk_table_attach(GTK_TABLE(table), w_fbdev_name, 1, 2, 4, 5, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4); |
| 758 |
+ |
|
| 759 |
+ |
w_fbdevice_file = make_entry(box, STR_FBDEVICE_FILE_CTRL, "fbdevicefile"); |
| 760 |
+ |
#endif |
| 761 |
+ |
|
| 762 |
|
make_checkbox(box, STR_NOSOUND_CTRL, "nosound", GTK_SIGNAL_FUNC(tb_nosound)); |
| 763 |
|
|
| 764 |
|
hide_show_graphics_widgets(); |
