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.104 by root, Sun Jul 30 13:14:15 2006 UTC vs.
Revision 1.126 by root, Sat Nov 18 18:19:05 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
… …
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
… …
47 68
48$Event::Eval = 0; 69$Event::Eval = 0;
49$Event::DIED = sub { 70$Event::DIED = sub {
50 # TODO: display dialog box or so 71 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 72 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1]; 73 return;#d#
74 CFPlus::fatal ($_[1]);
53}; 75};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 76
66my $MAX_FPS = 60; 77my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
68 79
69our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 81
71our $LAST_REFRESH; 82our $LAST_REFRESH;
72our $NOW; 83our $NOW;
73 84
74our $CFG; 85our $CFG;
75our $CONN; 86our $CONN;
87our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 88our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 89
78our $WANT_REFRESH; 90our $WANT_REFRESH;
79our $CAN_REFRESH; 91our $CAN_REFRESH;
80 92
… …
146 158
147sub debug { 159sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 160 $DEBUG_STATUS->set_text ($_[0]);
149} 161}
150 162
163sub message {
164 my ($para) = @_;
165
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
172}
173
151sub destroy_query_dialog { 174sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 175 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 176 if $_[0]{query_dialog};
154} 177}
155 178
156# server query dialog 179# server query dialog
157sub server_query { 180sub server_query {
158 my ($conn, $flags, $prompt) = @_; 181 my ($conn, $flags, $prompt) = @_;
159 182
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 184 x => "center",
162 y => "center", 185 y => "center",
163 title => "Server Query", 186 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 187 child => my $vbox = new CFPlus::UI::VBox,
165 ; 188 ;
… …
190 ); 213 );
191 214
192 $dialog->grab_focus; 215 $dialog->grab_focus;
193 216
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 217 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 218 $dialog->{tooltip} = "#charcreation_focus";
196 219
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 220 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 221 $MESSAGE_WINDOW->show;
199 222
200 unshift @dialog, new CFPlus::UI::Label 223 unshift @dialog, new CFPlus::UI::Label
… …
222 ); 245 );
223 246
224 unshift @dialog, new CFPlus::UI::Label 247 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 249 ellipsise => 0,
227 markup => 250 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 "<big><b>Character Creation: Race</b></big>\n\n"
229 . "Look at the <b>Messages</b> window to see a description of this race "
230 . "and the center of the screen to see how this race looks like "
231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
233 . "You can look at another race, or accept this race (you will cycle back to "
234 . "this race eventually, so you can take your time making this important choice."
235 ; 251 ;
236 252
237 } elsif ($prompt =~ /roll new stats/) { 253 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 254 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 255 $conn->send ("reply $stat");
… …
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 329 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 330 align => 0,
315 expand => 1, 331 expand => 1,
316 can_events => 1, 332 can_events => 1,
317 can_hover => 1, 333 can_hover => 1,
318 tooltip => $CFPlus::STAT_TOOLTIP{$name}, 334 tooltip => "#stat_$name",
319 ); 335 );
320 } 336 }
321 337
322 unshift @dialog, new CFPlus::UI::Label 338 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 339 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 340 ellipsise => 0,
325 markup => 341 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326 "<big><b>Character Creation: Stats</b></big>\n\n"
327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331 ; 342 ;
332 } 343 }
333 344
334 push @dialog, my $entry = new CFPlus::UI::Entry 345 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 346 on_changed => sub {
… …
364 status "logging in..."; 375 status "logging in...";
365 376
366 $LOGIN_BUTTON->set_text ("Logout"); 377 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 378 $SETUP_DIALOG->hide;
368 379
380 $PROFILE = $CFG->{profile}{default};
381
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 383
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
372 385
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
374 387
375 $CONN = eval { 388 $CONN = eval {
376 new CFPlus::Protocol 389 new CFPlus::Protocol
377 host => $host, 390 host => $host,
378 port => $port || 13327, 391 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 392 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 393 pass => $PROFILE->{password},
381 mapw => $mapsize, 394 mapw => $mapsize,
382 maph => $mapsize, 395 maph => $mapsize,
396
397 client => "cfplus $CFPlus::VERSION $] $^O",
383 398
384 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 400 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
387 map => $MAP, 402 map => $MAP,
… …
622 (new CFPlus::UI::Empty expand => 1), 637 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 638 (my $hb = new CFPlus::UI::HBox),
624 ], 639 ],
625 ); 640 );
626 641
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 642 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', 643 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', 644 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', 645 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635 646
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 647 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 648 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640 649
641 $GAUGES = { 650 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 651 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 652 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 653 };
… …
681 expand => 1, 690 expand => 1,
682 scroll_y => 1 691 scroll_y => 1
683 ); 692 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 693 $r->add (my $vb = new CFPlus::UI::VBox);
685 694
695 $vb->add (new CFPlus::UI::FancyFrame
696 label => "Player",
697 child => (my $pi = new CFPlus::UI::VBox),
698 );
699
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 700 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 701 can_hover => 1, can_events => 1,
688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 702 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 703 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 704 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 705 tooltip => "The map you are currently on (if supported by the server).");
692 706
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 707 $pi->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 708 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 710 tooltip => "The weight of the player including all inventory items.");
697 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 711 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698 can_hover => 1, can_events => 1, 712 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 713 tooltip => "The weight limit: you cannot carry more than this.");
700 714
715 $vb->add (new CFPlus::UI::FancyFrame
716 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 717 child => (my $hb = new CFPlus::UI::HBox expand => 1),
718 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 719 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 720
704 my $color2 = [1, 1, 0]; 721 my $color2 = [1, 1, 0];
705 722
706 for ( 723 for (
… …
721 ) { 738 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 739 my ($col, $row, $id, $label, $template) = @$_;
723 740
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 741 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 742 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 743 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 744 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 745 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 746 align => -1, text => $label, tooltip => "#stat_$label");
730 } 747 }
731 748
749 $vb->add (new CFPlus::UI::FancyFrame
750 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 751 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
752 );
733 753
734 my $row = 0; 754 my $row = 0;
735 my $col = 0; 755 my $col = 0;
736 756
737 my %resist_names = ( 757 my %resist_names = (
… …
837 857
838 my $table = $METASERVER->{table}; 858 my $table = $METASERVER->{table};
839 $table->clear; 859 $table->clear;
840 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841 861
842 my $buf; 862 my $ok = 0;
843 863
844 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 864 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent;
845 866
846 unless ($fh) { 867 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847 $label->set_text ("unable to contact metaserver: $!"); 868 } sub {
848 return; 869 my ($msg) = @_;
849 } 870 if ($msg) {
850
851 Event->io (fd => $fh, poll => 'r', cb => sub {
852 my $res = sysread $fh, $buf, 8192, length $buf;
853
854 if (!defined $res) {
855 $_[0]->w->cancel;
856 $label->set_text ("error while retrieving server list: $!");
857 } elsif ($res == 0) {
858 $_[0]->w->cancel;
859 status "server list retrieved";
860
861 utf8::decode $buf if utf8::valid $buf;
862
863 $table->clear; 871 $table->clear;
864 872
865 my @tip = ( 873 my @tip = (
866 "The current number of users logged in on the server.", 874 "The current number of users logged in on the server.",
867 "The hostname of the server.", 875 "The hostname of the server.",
… …
877 for 0 .. $#col; 885 for 0 .. $#col;
878 886
879 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
880 888
881 my $y = 0; 889 my $y = 0;
882 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} }
896 ) {
883 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
884 899
885 for ($desc) { 900 for ($desc) {
886 s/<br>/\n/gi; 901 s/<br>/\n/gi;
887 s/<li>/\n· /gi; 902 s/<li>/\n· /gi;
888 s/<.*?>//sgi; 903 s/<.*?>//sgi;
889 s/&/&amp;/g; 904 s/&amp;/&/g;
890 s/</&lt;/g; 905 s/&lt;/</g;
891 s/>/&gt;/g; 906 s/&gt;/>/g;
892 } 907 }
893 908
894 $uptime = sprintf "%dd %02d:%02d:%02d", 909 $uptime = sprintf "%dd %02d:%02d:%02d",
895 (int $m->[8] / 86400), 910 (int $uptime / 86400),
896 (int $m->[8] / 3600) % 24, 911 (int $uptime / 3600) % 24,
897 (int $m->[8] / 60) % 60, 912 (int $uptime / 60) % 60,
898 $m->[8] % 60; 913 $uptime % 60;
899 914
900 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
901 916
902 $y++; 917 $y++;
903 918
… …
913 ), 928 ),
914 (new CFPlus::UI::Empty expand => 1), 929 (new CFPlus::UI::Empty expand => 1),
915 ]); 930 ]);
916 931
917 $table->add ($_, $y, new CFPlus::UI::Label 932 $table->add ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4,
918 ellipsise => 0, 934 ellipsise => 0,
919 align => $align[$_], 935 align => $align[$_],
920 text => $m->[$_], 936 text => $m->[$_],
921 tooltip => $tip[$_], 937 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
922 can_hover => 1, 939 can_hover => 1,
923 can_events => 1, 940 can_events => 1,
924 fontsize => 0.8) 941 fontsize => 0.8)
925 for 0 .. $#$m; 942 for 0 .. $#$m;
926 } 943 }
944 } else {
945 $ok or $label->set_text ("error while contacting metaserver");
927 } 946 }
928 }); 947 };
948
929} 949}
930 950
931sub metaserver_dialog { 951sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 953 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 954 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 955
936 my $dialog = new CFPlus::UI::FancyFrame 956 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 957 title => "Server List",
938 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
939 x => 'center', 959 x => 'center',
940 y => 'center', 960 y => 'center',
941 z => 3, 961 z => 3,
962 force_w => $::WIDTH * 0.9,
942 force_h => $::HEIGHT * 0.4, 963 force_h => $::HEIGHT * 0.7,
943 child => $vbox, 964 child => $vbox,
944 has_close_button => 1, 965 has_close_button => 1,
945 table => $table, 966 table => $table,
946 on_visibility_change => sub { 967 on_visibility_change => sub {
947 update_metaserver ($_[0]) if $_[1]; 968 update_metaserver ($_[0]) if $_[1];
… …
953} 974}
954 975
955sub server_setup { 976sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 977 my $vbox = new CFPlus::UI::VBox;
957 978
979 $vbox->add (new CFPlus::UI::FancyFrame
980 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 981 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
982 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 983 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 984
961 { 985 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 986 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 987
… …
1047 }, 1071 },
1048 ); 1072 );
1049 1073
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1076 text => $CFG->{say_command},
1053 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. " 1077 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. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1080 on_changed => sub {
1057 my ($self, $value) = @_; 1081 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1082 $CFG->{say_command} = $value;
1059 0 1083 0
1060 } 1084 }
1061 ); 1085 );
1062 1086
1087 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips},
1090 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1091 on_changed => sub {
1092 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value;
1094 0
1095 }
1096 );
1097
1063 $vbox->add (new CFPlus::UI::Label 1098 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1099 label => "Server Info",
1065 fontsize => 1.2,
1066 padding_y => 8,
1067 fg => [1, 1, 0, 1],
1068 );
1069
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1100 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1101 );
1071 1102
1072 $vbox 1103 $vbox
1073} 1104}
1074 1105
1075sub message_window { 1106sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1107 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1108 name => "message_window",
1078 title => "Messages", 1109 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1110 border_bg => [1, 1, 1, 1],
1080 x => "max", 1111 x => "max",
1081 y => 0, 1112 y => 0,
… …
1131 window => $window, 1162 window => $window,
1132 input => $input, 1163 input => $input,
1133 }; 1164 };
1134 1165
1135 $window 1166 $window
1136}
1137
1138sub open_quit_dialog {
1139 unless ($QUIT_DIALOG) {
1140 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 title => "Really Quit?",
1145 on_key_down => sub {
1146 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide;
1148 }
1149 ;
1150
1151 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1152
1153 $vb->add (new CFPlus::UI::Label
1154 text => "You should find a savebed and apply it first!",
1155 max_w => $WIDTH * 0.25,
1156 ellipsize => 0,
1157 );
1158 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1159 $hb->add (new CFPlus::UI::Button
1160 text => "Ok",
1161 expand => 1,
1162 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1163 );
1164 $hb->add (new CFPlus::UI::Button
1165 text => "Quit anyway",
1166 expand => 1,
1167 on_activate => sub { exit },
1168 );
1169 }
1170
1171 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus;
1173} 1167}
1174 1168
1175sub autopickup_setup { 1169sub autopickup_setup {
1176 my $table = new CFPlus::UI::Table; 1170 my $table = new CFPlus::UI::Table;
1177 1171
… …
1334 $PL_WINDOW->show; 1328 $PL_WINDOW->show;
1335 } 1329 }
1336} 1330}
1337 1331
1338sub player_window { 1332sub player_window {
1339 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1333 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1340 x => "center", 1334 x => "center",
1341 y => "center", 1335 y => "center",
1342 force_w => $WIDTH * 9/10, 1336 force_w => $WIDTH * 9/10,
1343 force_h => $HEIGHT * 9/10, 1337 force_h => $HEIGHT * 9/10,
1344 title => "Player", 1338 title => "Player",
… …
1386 1380
1387 my $refresh; 1381 my $refresh;
1388 $refresh = $BIND_UPD_CB = sub { 1382 $refresh = $BIND_UPD_CB = sub {
1389 $binding_list->clear (); 1383 $binding_list->clear ();
1390 1384
1385 return unless $PROFILE;
1386
1391 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1387 for my $mod (keys %{$PROFILE->{bindings}}) {
1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1388 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1389 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395 1391
1396 my $lbl = join "; ", @$cmds; 1392 my $lbl = join "; ", @$cmds;
1397 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1393 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1398 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1394 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1399 $hb->add (new CFPlus::UI::Button 1395 $hb->add (new CFPlus::UI::Button
1400 text => "delete", 1396 text => "delete",
1401 tooltip => "Deletes the binding", 1397 tooltip => "Deletes the binding",
1402 on_activate => sub { 1398 on_activate => sub {
1403 $binding_list->remove ($hb); 1399 $binding_list->remove ($hb);
1404 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1400 delete $PROFILE->{bindings}{$mod}{$sym};
1405 0 1401 0
1406 }); 1402 });
1407 1403
1408 $hb->add (new CFPlus::UI::Button 1404 $hb->add (new CFPlus::UI::Button
1409 text => "edit", 1405 text => "edit",
1410 tooltip => "Edits the binding", 1406 tooltip => "Edits the binding",
1411 on_activate => sub { 1407 on_activate => sub {
1412 $::BIND_EDITOR->set_binding ( 1408 $::BIND_EDITOR->set_binding (
1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1409 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1414 sub { 1410 sub {
1415 my ($nmod, $nsym, $ncmds) = @_; 1411 my ($nmod, $nsym, $ncmds) = @_;
1416 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1412 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1417 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1413 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1418 $refresh->(); 1414 $refresh->();
… …
1433 } 1429 }
1434 } 1430 }
1435 }; 1431 };
1436 1432
1437 my $vb = new CFPlus::UI::VBox; 1433 my $vb = new CFPlus::UI::VBox;
1434 $vb->add (new CFPlus::UI::FancyFrame
1435 label => "Options",
1438 $vb->add (my $hb = new CFPlus::UI::HBox); 1436 child => (my $hb = new CFPlus::UI::HBox),
1437 );
1439 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1438 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFPlus::UI::CheckBox 1439 $hb->add (new CFPlus::UI::CheckBox
1441 expand => 1, 1440 expand => 1,
1442 state => $CFG->{shift_fire_stop}, 1441 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1442 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1445 my ($cbox, $value) = @_; 1444 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value; 1445 $CFG->{shift_fire_stop} = $value;
1447 0 1446 0
1448 }); 1447 });
1449 1448
1450 $vb->add ($binding_list); 1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Bindings",
1451 child => $binding_list);
1451 $vb->add (my $hb = new CFPlus::UI::HBox); 1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1452 1453
1453 $hb->add (new CFPlus::UI::Button 1454 $hb->add (new CFPlus::UI::Button
1454 text => "record new", 1455 text => "record new",
1455 expand => 1, 1456 expand => 1,
… …
1488 1489
1489 $vb 1490 $vb
1490} 1491}
1491 1492
1492sub help_window { 1493sub help_window {
1493 my $win = new CFPlus::UI::FancyFrame 1494 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1495 x => 'center',
1495 y => 'center', 1496 y => 'center',
1496 z => 2, 1497 z => 4,
1497 name => 'doc_browser', 1498 name => 'doc_browser',
1498 force_w => int $WIDTH * 7/8, 1499 force_w => int $WIDTH * 7/8,
1499 force_h => int $HEIGHT * 7/8, 1500 force_h => int $HEIGHT * 7/8,
1500 title => "Help Browser", 1501 title => "Help Browser",
1501 has_close_button => 1; 1502 has_close_button => 1;
1502 1503
1503 $win->add (my $vbox = new CFPlus::UI::VBox); 1504 $win->add (my $vbox = new CFPlus::UI::VBox);
1504 1505
1506 $vbox->add (new CFPlus::UI::FancyFrame
1507 label => "Navigation",
1505 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1508 child => (my $buttons = new CFPlus::UI::HBox),
1509 );
1506 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1510 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507 expand => 1, fontsize => 0.8, padding_x => 4); 1511 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1508 1512
1509 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1513 my @history;
1510 $buttons->add (my $combo = new CFPlus::UI::Selector 1514 my @future;
1511 value => undef, 1515 my $curnode;
1512 options => [ 1516
1513 [intro => "Introduction"], 1517 my $load_node; $load_node = sub {
1514 [manual => "Main Manual"], 1518 my ($node, $para) = @_;
1515 [skill_help => "Skill Reference"], 1519
1516 [command_help => "Command Reference"], 1520 $buttons->clear;
1517 [dmcommand_help => "DM Commands"], 1521
1518 [COPYING => "License Terms"], 1522 $buttons->add (new CFPlus::UI::Button
1523 text => "⇤",
1524 tooltip => "back to the starting page",
1525 on_activate => sub {
1526 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1527 unshift @future, @history;
1528 @history = ();
1529 $load_node->(@{shift @future});
1530 },
1531 );
1532
1533 if (@history) {
1534 $buttons->add (new CFPlus::UI::Button
1535 text => "⋘",
1536 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1537 on_activate => sub {
1538 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1539 $load_node->(@{pop @history});
1540 },
1541 );
1519 ], 1542 }
1520 on_changed => sub {
1521 my ($self, $pod) = @_;
1522 1543
1544 if (@future) {
1545 $buttons->add (new CFPlus::UI::Button
1546 text => "⋙",
1547 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1548 on_activate => sub {
1549 push @history, [$curnode, $viewer->current_paragraph];
1550 $load_node->(@{shift @future});
1551 },
1552 );
1553 }
1554
1555 $buttons->add (new CFPlus::UI::Label text => " ");
1556
1557 my @path = CFPlus::Pod::full_path_of $node;
1558 pop @path; # drop current node
1559
1560 for my $node (@path) {
1561 $buttons->add (new CFPlus::UI::Button
1562 text => $node->{kw}[0],
1563 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1564 on_activate => sub {
1565 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1566 $load_node->($node);
1567 },
1568 );
1569 $buttons->add (new CFPlus::UI::Label text => "/");
1570 }
1571
1572 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1573
1574 $curnode = $node;
1575
1523 $viewer->clear; 1576 $viewer->clear;
1524 $viewer->add_paragraph (@{ CFPlus::Pod::pod_paragraphs $pod }); 1577 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1525 $viewer->set_offset (0); 1578 $viewer->scroll_to ($para);
1579 };
1526 1580
1581 $load_node->(CFPlus::Pod::find pod => "mainpage");
1582
1583 $CFPlus::Pod::goto_document = sub {
1584 my (@path) = @_;
1585
1586 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1587
1588 $load_node->((CFPlus::Pod::find @path)[0]);
1589 $win->show;
1590 };
1591
1592 $win
1593}
1594
1595sub open_string_query {
1596 my ($title, $cb, $txt, $tooltip) = @_;
1597 my $dialog = new CFPlus::UI::Toplevel
1598 x => "center",
1599 y => "center",
1600 z => 50,
1601 force_w => $WIDTH * 4/5,
1602 title => $title;
1603
1604 $dialog->add (
1605 my $e = new CFPlus::UI::Entry
1606 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1607 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1608 tooltip => $tooltip
1609 );
1610
1611 $e->grab_focus;
1612 $e->set_text ($txt) if $txt;
1613 $dialog->show;
1614}
1615
1616sub open_quit_dialog {
1617 unless ($QUIT_DIALOG) {
1618 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1619 x => "center",
1620 y => "center",
1621 z => 50,
1622 title => "Really Quit?",
1623 on_key_down => sub {
1624 my ($dialog, $ev) = @_;
1625 $ev->{sym} == 27 and $dialog->hide;
1527 0 1626 }
1627 ;
1628
1629 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1630
1631 $vb->add (new CFPlus::UI::Label
1632 text => "You should find a savebed and apply it first!",
1633 max_w => $WIDTH * 0.25,
1634 ellipsize => 0,
1635 );
1636 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1637 $hb->add (new CFPlus::UI::Button
1638 text => "Ok",
1639 expand => 1,
1640 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1641 );
1642 $hb->add (new CFPlus::UI::Button
1643 text => "Quit anyway",
1644 expand => 1,
1645 on_activate => sub { exit },
1646 );
1647 }
1648
1649 $QUIT_DIALOG->show;
1650 $QUIT_DIALOG->grab_focus;
1651}
1652
1653sub show_tip_of_the_day {
1654 # find all tips
1655 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1656
1657 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1658 $todindex = 0 if $todindex >= @tod;
1659 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1660
1661 # create dialog
1662 my $dialog;
1663
1664 my $close = sub {
1665 $dialog->destroy;
1666 };
1667
1668 $dialog = new CFPlus::UI::Toplevel
1669 x => "center",
1670 y => "center",
1671 z => 3,
1672 name => 'tip_of_the_day',
1673 force_w => int $WIDTH * 4/9,
1674 force_h => int $WIDTH * 2/9,
1675 title => "Tip of the day #" . (1 + $todindex),
1676 child => my $vbox = new CFPlus::UI::VBox,
1677 has_close_button => 1,
1678 on_delete => $close,
1679 ;
1680
1681 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1684
1685 $vbox->add (my $table = new CFPlus::UI::Table);
1686
1687 $table->add (0, 0, new CFPlus::UI::Button
1688 text => "Close",
1689 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1690 on_activate => $close,
1691 );
1692
1693 $table->add (2, 0, new CFPlus::UI::Button
1694 text => "Next",
1695 tooltip => "Show the next <b>Tip of the day</b>.",
1696 on_activate => sub {
1697 $close->();
1698 &show_tip_of_the_day;
1528 }, 1699 },
1529 on_visibility_change => sub {
1530 my ($self, $visible) = @_;
1531 return unless $visible;
1532 return if $self->{value};
1533 $self->set_value ("intro");
1534 0
1535 },
1536 ); 1700 );
1537 1701
1538 $win 1702 $dialog->show;
1539} 1703}
1540 1704
1541sub sdl_init { 1705sub sdl_init {
1542 CFPlus::SDL_Init 1706 CFPlus::SDL_Init
1543 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
… …
1590 force_x => 0, 1754 force_x => 0,
1591 force_y => "max", 1755 force_y => "max",
1592 child => $STATUSBOX, 1756 child => $STATUSBOX,
1593 )->show; 1757 )->show;
1594 1758
1595 CFPlus::UI::FancyFrame->new ( 1759 CFPlus::UI::Toplevel->new (
1596 title => "Map", 1760 title => "Map",
1597 name => "mapmap", 1761 name => "mapmap",
1598 x => 0, 1762 x => 0,
1599 y => $FONTSIZE + 8, 1763 y => $FONTSIZE + 8,
1600 border_bg => [1, 1, 1, 192/255], 1764 border_bg => [1, 1, 1, 192/255],
… …
1628 can_hover => 1, 1792 can_hover => 1,
1629 can_events => 1, 1793 can_events => 1,
1630 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1794 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1631 ; 1795 ;
1632 1796
1633 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1797 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1634 title => "Setup", 1798 title => "Setup",
1635 name => "setup_dialog", 1799 name => "setup_dialog",
1636 x => 'center', 1800 x => 'center',
1637 y => 'center', 1801 y => 'center',
1638 z => 2, 1802 z => 2,
… …
1892 log_fontsize => 0.7, 2056 log_fontsize => 0.7,
1893 gauge_fontsize => 1, 2057 gauge_fontsize => 1,
1894 gauge_size => 0.35, 2058 gauge_size => 0.35,
1895 stat_fontsize => 0.7, 2059 stat_fontsize => 0.7,
1896 mapsize => 100, 2060 mapsize => 100,
1897 say_command => 'say', 2061 say_command => 'chat',
1898 audio_enable => 1, 2062 audio_enable => 1,
1899 bgm_enable => 1, 2063 bgm_enable => 1,
1900 bgm_volume => 0.25, 2064 bgm_volume => 0.25,
1901 face_prefetch => 0, 2065 face_prefetch => 0,
1902 output_sync => 1, 2066 output_sync => 1,
1903 output_count => 1, 2067 output_count => 1,
1904 pickup => 0, 2068 pickup => 0,
1905 inv_sort => "mtime", 2069 inv_sort => "mtime",
1906 default => "profile", # default profile 2070 default => "profile", # default profile
2071 show_tips => 1,
1907 ); 2072 );
1908 2073
1909 while (my ($k, $v) = each %DEF_CFG) { 2074 while (my ($k, $v) = each %DEF_CFG) {
1910 $CFG->{$k} = $v unless exists $CFG->{$k}; 2075 $CFG->{$k} = $v unless exists $CFG->{$k};
1911 } 2076 }
… …
1955# } 2120# }
1956# my $t2 = Time::HiRes::time; 2121# my $t2 = Time::HiRes::time;
1957# warn $t2-$t1; 2122# warn $t2-$t1;
1958# } 2123# }
1959 2124
2125 $startup_done->();
2126
1960 video_init; 2127 video_init;
1961 audio_init; 2128 audio_init;
1962} 2129}
2130
2131show_tip_of_the_day if $CFG->{show_tips};
1963 2132
1964Event::loop; 2133Event::loop;
1965#CFPlus::SDL_Quit; 2134#CFPlus::SDL_Quit;
1966#CFPlus::_exit 0; 2135#CFPlus::_exit 0;
1967 2136

Diff Legend

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