ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.139 by root, Sat Dec 9 22:06:51 2006 UTC vs.
Revision 1.146 by root, Wed Apr 4 02:43:30 2007 UTC

… …
176sub destroy_query_dialog { 176sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 177 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 178 if $_[0]{query_dialog};
179} 179}
180 180
181# FIXME: a very ugly hack to wait for stat update look below! #d#
182our $QUERY_TIMER; #d#
183
181# server query dialog 184# server query dialog
182sub server_query { 185sub server_query {
183 my ($conn, $flags, $prompt) = @_; 186 my ($conn, $flags, $prompt) = @_;
187
188 # FIXME: a very ugly hack to wait for stat update #d#
189 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
190 unless ($QUERY_TIMER) {
191 $QUERY_TIMER =
192 Event->timer (
193 after => 1,
194 cb => sub {
195 server_query ($conn, $flags, $prompt, 1);
196 $QUERY_TIMER = undef
197 }
198 );
199 return;
200 }
201 }
184 202
185 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 203 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
186 x => "center", 204 x => "center",
187 y => "center", 205 y => "center",
188 title => "Server Query", 206 title => "Server Query",
… …
447sub graphics_setup { 465sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 466 my $vbox = new CFPlus::UI::VBox;
449 467
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 469
470 my $row = 0;
471
472 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
473 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
474 can_events => 1,
475 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
476
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 477 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 478 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 479
455 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 480 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 481 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 482
458 $mode_slider->connect (changed => sub { 483 $mode_slider->connect (changed => sub {
… …
460 485
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 486 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 487 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 488 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 489 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 490
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 491 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 492 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 493 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 494 tooltip => "Bring the client into fullscreen mode.",
… …
887 for 0 .. $#col; 910 for 0 .. $#col;
888 911
889 my @align = qw(1 0 1 1 -1); 912 my @align = qw(1 0 1 1 -1);
890 913
891 my $y = 0; 914 my $y = 0;
892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} } 915 for my $m (@{ $msg->{servers} }) {
898 ) {
899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 916 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 917 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
901 918
902 for ($desc) { 919 for ($desc) {
903 s/<br>/\n/gi; 920 s/<br>/\n/gi;
904 s/<li>/\n· /gi; 921 s/<li>/\n· /gi;
905 s/<.*?>//sgi; 922 s/<.*?>//sgi;
… …
935 max_w => $::WIDTH * 0.4, 952 max_w => $::WIDTH * 0.4,
936 ellipsise => 0, 953 ellipsise => 0,
937 align => $align[$_], 954 align => $align[$_],
938 text => $m->[$_], 955 text => $m->[$_],
939 tooltip => $tip[$_], 956 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 957 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
941 can_hover => 1, 958 can_hover => 1,
942 can_events => 1, 959 can_events => 1,
943 fontsize => 0.8) 960 fontsize => 0.8)
944 for 0 .. $#$m; 961 for 0 .. $#$m;
945 } 962 }
… …
1046 . "so only set it if you really need to prefetch images. " 1063 . "so only set it if you really need to prefetch images. "
1047 . "This option can be set and unset any time.", 1064 . "This option can be set and unset any time.",
1048 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1065 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1049 ); 1066 );
1050 1067
1051 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1068 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1052 $table->add (1, 9, new CFPlus::UI::Entry 1069 $table->add (1, 9, new CFPlus::UI::Entry
1070 text => $CFG->{output_rate},
1071 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1072 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1073 . "default will be used, which is usually around 100kb/s.",
1074 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1075 );
1076
1077 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1078 $table->add (1, 10, new CFPlus::UI::Entry
1053 text => $CFG->{output_count}, 1079 text => $CFG->{output_count},
1054 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1080 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1055 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1081 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1056 ); 1082 );
1057 1083
1058 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1084 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1059 $table->add (1, 10, new CFPlus::UI::Entry 1085 $table->add (1, 11, new CFPlus::UI::Entry
1060 text => $CFG->{output_sync}, 1086 text => $CFG->{output_sync},
1061 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1087 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1062 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1088 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1063 ); 1089 );
1064 1090
1065 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1091 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1066 expand => 1, 1092 expand => 1,
1067 align => 0, 1093 align => 0,
1068 text => "Login", 1094 text => "Login",
1069 on_activate => sub { 1095 on_activate => sub {
1070 $CONN ? stop_game 1096 $CONN ? stop_game
1071 : start_game; 1097 : start_game;
1072 0 1098 0
1073 }, 1099 },
1074 ); 1100 );
1075 1101
1076 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1102 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1103 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1078 text => $CFG->{say_command}, 1104 text => $CFG->{say_command},
1079 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1105 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1080 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1106 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1107 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1082 on_changed => sub { 1108 on_changed => sub {
… …
1084 $CFG->{say_command} = $value; 1110 $CFG->{say_command} = $value;
1085 0 1111 0
1086 } 1112 }
1087 ); 1113 );
1088 1114
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1115 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1116 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips}, 1117 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1118 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub { 1119 on_changed => sub {
1094 my ($self, $value) = @_; 1120 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value; 1121 $CFG->{show_tips} = $value;
… …
1770} 1796}
1771 1797
1772sub setup_build_button { 1798sub setup_build_button {
1773 my ($enabled) = @_; 1799 my ($enabled) = @_;
1774 if ($enabled) { 1800 if ($enabled) {
1801 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1775 $BUILD_BUTTON ||= new CFPlus::UI::Button 1802 $BUILD_BUTTON ||= new CFPlus::UI::Button
1776 text => "Build", 1803 text => "Build",
1777 tooltip => "Opens the ingame builder", 1804 tooltip => "Opens the ingame builder",
1778 on_activate => sub { 1805 on_activate => sub {
1779 if ($CONN) { 1806 if ($CONN) {
… …
2080 bgm_enable => 1, 2107 bgm_enable => 1,
2081 bgm_volume => 0.25, 2108 bgm_volume => 0.25,
2082 face_prefetch => 0, 2109 face_prefetch => 0,
2083 output_sync => 1, 2110 output_sync => 1,
2084 output_count => 1, 2111 output_count => 1,
2112 output_rate => "",
2085 pickup => 0, 2113 pickup => 0,
2086 inv_sort => "mtime", 2114 inv_sort => "mtime",
2087 default => "profile", # default profile 2115 default => "profile", # default profile
2088 show_tips => 1, 2116 show_tips => 1,
2089 ); 2117 );

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines