ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.384 by root, Fri Jul 20 16:32:11 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
393 427
394 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
395 429
396 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
397 431
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 435 }
402} 436}
403 437
404# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
405sub coord2local { 439sub coord2local {
406 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
407 441
442 Carp::confess unless $self->{parent};#d#
443
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 445}
410 446
411# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
412sub coord2global { 448sub coord2global {
413 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
414 450
451 Carp::confess unless $self->{parent};#d#
452
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 454}
417 455
418sub invoke_focus_in { 456sub invoke_focus_in {
419 my ($self) = @_; 457 my ($self) = @_;
420 458
421 return if $FOCUS == $self; 459 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
423 461
424 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
425 463
426 $focus->update if $focus; 464 $self->update;
427 $FOCUS->update;
428 465
429 0 466 0
430} 467}
431 468
432sub invoke_focus_out { 469sub invoke_focus_out {
433 my ($self) = @_; 470 my ($self) = @_;
434 471
435 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
436 473
437 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
438 475
439 $focus->update if $focus; #? 476 $self->update;
440 477
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 479 unless $FOCUS;
443 480
444 0 481 0
445} 482}
446 483
447sub grab_focus { 484sub grab_focus {
448 my ($self) = @_; 485 my ($self) = @_;
449 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
451} 489}
452 490
453sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
457 496
458sub invoke_button_down { 497sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
460 499
461 $self->grab_focus; 500 $self->grab_focus;
462 501
463 1 502 0
464} 503}
465 504
466sub connect { 505sub connect {
467 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
468 507
469 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
470} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
471 528
472sub emit { 529sub emit {
473 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
474 531
475 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
479} 550}
480 551
481sub find_widget { 552sub find_widget {
482 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
483 554
… …
491} 562}
492 563
493sub set_parent { 564sub set_parent {
494 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
495 566
496 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
498} 569}
499 570
500sub realloc { 571sub realloc {
501 my ($self) = @_; 572 my ($self) = @_;
… …
535 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
536 607
537 # update screen rectangle 608 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 611
543 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 615
… …
569 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
572 glEnd; 641 glEnd;
573 glPopMatrix; 642 glPopMatrix;
574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575 } 644 }
576 645
577 $self->_draw; 646 $self->_draw;
578 glPopMatrix; 647 glPopMatrix;
579} 648}
… …
582 my ($self) = @_; 651 my ($self) = @_;
583 652
584 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
585} 654}
586 655
656my $cntx;#d#
587sub DESTROY { 657sub DESTROY {
588 my ($self) = @_; 658 my ($self) = @_;
589 659
590 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
591 661
592 eval { $self->destroy }; 662 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
594} 666}
595 667
596############################################################################# 668#############################################################################
597 669
598package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
599 671
600our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
601 673
602use strict; 674use strict;
603use CFClient::OpenGL; 675use CFPlus::OpenGL;
604 676
605sub new { 677sub new {
606 my $class = shift; 678 my $class = shift;
607 679
608 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
639 } 711 }
640} 712}
641 713
642############################################################################# 714#############################################################################
643 715
644package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
645 717
646our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
647 719
648sub new { 720sub new {
649 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
651} 723}
… …
658 730
659sub draw { } 731sub draw { }
660 732
661############################################################################# 733#############################################################################
662 734
663package CFClient::UI::Container; 735package CFPlus::UI::Container;
664 736
665our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
666 738
667sub new { 739sub new {
668 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
669 741
670 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
679 if $children; 751 if $children;
680 752
681 $self 753 $self
682} 754}
683 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
684sub add { 764sub add {
685 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
686 766
687 $_->set_parent ($self) 767 $_->set_parent ($self)
688 for @widgets; 768 for @widgets;
… …
748 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
749} 829}
750 830
751############################################################################# 831#############################################################################
752 832
753package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
754 834
755our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
756 836
757sub new { 837sub new {
758 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
759 839
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761 841
762 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
763} 843}
764 844
765sub add { 845sub add {
… …
772sub remove { 852sub remove {
773 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
774 854
775 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
776 856
777 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
778 unless @{$self->{children}}; 858 unless @{$self->{children}};
779} 859}
780 860
781sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
782 862
… …
794 874
795############################################################################# 875#############################################################################
796 876
797# back-buffered drawing area 877# back-buffered drawing area
798 878
799package CFClient::UI::Window; 879package CFPlus::UI::Window;
800 880
801our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
802 882
803use CFClient::OpenGL; 883use CFPlus::OpenGL;
804 884
805sub new { 885sub new {
806 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
807 887
808 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
830} 910}
831 911
832sub render_child { 912sub render_child {
833 my ($self) = @_; 913 my ($self) = @_;
834 914
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
838 918
839 { 919 {
840 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
841 921
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
844 } 926 }
845
846 $self->_render;
847 }; 927 };
848} 928}
849 929
850sub _draw { 930sub _draw {
851 my ($self) = @_; 931 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 932
855 my $tex = $self->{texture} 933 my $tex = $self->{texture}
856 or return; 934 or return;
857 935
858 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
861 939
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
863 941
864 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
865} 943}
866 944
867############################################################################# 945#############################################################################
868 946
869package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
870 948
949use List::Util qw(min max);
950
871our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
872 952
873sub new { 953sub new {
874 my $class = shift; 954 my $class = shift;
875 955
876 $class->SUPER::new ( 956 $class->SUPER::new (
… …
906} 986}
907 987
908sub set_offset { 988sub set_offset {
909 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
910 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
911 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
912 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
913 997
998 $self->emit (changed => $x, $y);
914 $self->update; 999 $self->update;
1000 }
915} 1001}
916 1002
917# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
918sub coord2local { 1004sub coord2local {
919 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1024 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1026 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1028 }
943} 1029}
944 1030
945sub _render { 1031sub _render {
946 my ($self) = @_; 1032 my ($self) = @_;
947 1033
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1036
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1038
953 $self->SUPER::_render; 1039 $self->SUPER::_render;
954} 1040}
955 1041
956############################################################################# 1042#############################################################################
957 1043
958package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
959 1045
960our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
961 1047
962sub new { 1048sub new {
963 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
964 1050
965 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
966 1052
967 my $self; 1053 my $self;
968 1054
969 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
970 vertical => 1, 1065 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1067 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1070 },
975 ; 1071 ;
976 1072
977 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
979 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
980 %arg, 1081 %arg,
981 ); 1082 );
982 1083
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
984 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
985 1101
986 $self 1102 $self
987} 1103}
1104
1105#TODO# update range on size_allocate depending on child
988 1106
989sub add { 1107sub add {
990 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
991 1109
992 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
993} 1111}
994 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133#!/opt/bin/perl
1134
1135my $startup_done = sub { };
1136our $PANGO = "1.5.0";
1137
1138# do splash-screen thingy on win32
1139BEGIN {
1140 if (%PAR::LibCache && $^O eq "MSWin32") {
1141 while (my ($filename, $zip) = each %PAR::LibCache) {
1142 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
1143 }
1144
1145 require Win32::GUI::SplashScreen;
1146
1147 Win32::GUI::SplashScreen::Show (
1148 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
1149 );
1150
1151 $startup_done = sub {
1152 Win32::GUI::SplashScreen::Done (1);
1153 };
1154 }
1155}
1156
1157use strict;
1158use utf8;
1159
1160use Carp 'verbose';
1161
1162# do things only needed for single-binary version (par)
1163BEGIN {
1164 if (%PAR::LibCache) {
1165 @INC = grep ref, @INC; # weed out all paths except pars loader refs
1166
1167 my $tmp = $ENV{PAR_TEMP};
1168
1169 while (my ($filename, $zip) = each %PAR::LibCache) {
1170 for ($zip->memberNames) {
1171 next unless /^root\/(.*)/;
1172 $zip->extractMember ($_, "$tmp/$1")
1173 unless -e "$tmp/$1";
1174 }
1175 }
1176
1177 if ($^O eq "MSWin32") {
1178 # relocatable
1179 } else {
1180 # unix, need to patch pango rc file
1181 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
1182 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
1183 local $/;
1184 my $rc = <$fh>;
1185 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
1186
1187 mkdir "$tmp/pango-modules";
1188 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
1189 or die "$tmp/pango-modules/pango.modules: $!";
1190 print $fh $rc;
1191
1192 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
1193 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
1194 or die "$ENV{PANGO_RC_FILE}: $!";
1195 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
1196 }
1197
1198 unshift @INC, $tmp;
1199 }
1200}
1201
1202# need to do it again because that pile of garbage called PAR nukes it before main
1203unshift @INC, $ENV{PAR_TEMP}
1204 if %PAR::LibCache;
1205
1206use Time::HiRes 'time';
1207use Event;
1208
1209use Crossfire;
1210use Crossfire::Protocol::Constants;
1211
1212use Compress::LZF;
1213
1214use CFPlus;
1215use CFPlus::OpenGL ();
1216use CFPlus::Protocol;
1217use CFPlus::DB;
1218use CFPlus::UI;
1219use CFPlus::UI::Inventory;
1220use CFPlus::UI::SpellList;
1221use CFPlus::Pod;
1222use CFPlus::MapWidget;
1223use CFPlus::Macro;
1224
1225$SIG{QUIT} = sub { Carp::cluck "QUIT" };
1226$SIG{PIPE} = 'IGNORE';
1227
1228$Event::Eval = 1;
1229$Event::DIED = sub {
1230 CFPlus::fatal Carp::longmess $_[1]
1231};
1232
1233my $MAX_FPS = 60;
1234my $MIN_FPS = 5; # unused as of yet
1235
1236our $META_SERVER = "http://metaserver.schmorp.de/current.json";
1237
1238our $LAST_REFRESH;
1239our $NOW;
1240
1241our $CFG;
1242our $CONN;
1243our $PROFILE; # current profile
1244our $FAST; # fast, low-quality mode, possibly useful for software-rendering
1245
1246our $WANT_REFRESH;
1247our $CAN_REFRESH;
1248
1249our @SDL_MODES;
1250our $WIDTH;
1251our $HEIGHT;
1252our $FULLSCREEN;
1253our $FONTSIZE;
1254
1255our $FONT_PROP;
1256our $FONT_FIXED;
1257
1258our $MAP;
1259our $MAPMAP;
1260our $MAPWIDGET;
1261our $BUTTONBAR;
1262our $LOGVIEW;
1263our $CONSOLE;
1264our $METASERVER;
1265our $LOGIN_BUTTON;
1266our $QUIT_DIALOG;
1267our $HOST_ENTRY;
1268our $FULLSCREEN_ENABLE;
1269our $PICKUP_ENABLE;
1270our $SERVER_INFO;
1271
1272our $SETUP_DIALOG;
1273our $SETUP_NOTEBOOK;
1274our $SETUP_SERVER;
1275our $SETUP_KEYBOARD;
1276
1277our $PL_NOTEBOOK;
1278our $PL_WINDOW;
1279
1280our $INVENTORY_PAGE;
1281our $STATS_PAGE;
1282our $SKILL_PAGE;
1283our $SPELL_PAGE;
1284our $SPELL_LIST;
1285
1286our $HELP_WINDOW;
1287our $MESSAGE_WINDOW;
1288our $FLOORBOX;
1289our $GAUGES;
1290our $STATWIDS;
1291
1292our $SDL_ACTIVE;
1293our %SDL_CB;
1294
1295our $SDL_MIXER;
1296our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
1297our @MUSIC_WANT;
1298our $MUSIC_START;
1299our $MUSIC_PLAYING;
1300our $MUSIC_PLAYER;
1301our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
1302our @SOUNDS; # event => file mapping
1303our %AUDIO_CHUNKS; # audio files
1304
1305our $ALT_ENTER_MESSAGE;
1306our $STATUSBOX;
1307our $DEBUG_STATUS;
1308
1309our $INV;
1310our $INVR;
1311our $INV_RIGHT_HB;
1312
1313our $PICKUP_CFG;
1314
1315our $IN_BUILD_MODE;
1316our $BUILD_BUTTON;
1317
1318sub status {
1319 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
1320}
1321
1322sub debug {
1323 $DEBUG_STATUS->set_text ($_[0]);
1324}
1325
1326sub message {
1327 my ($para) = @_;
1328
1329 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1330
1331 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
1332
1333 $LOGVIEW->add_paragraph ($para);
1334 $LOGVIEW->scroll_to_bottom;
1335}
1336
1337sub destroy_query_dialog {
1338 (delete $_[0]{query_dialog})->destroy
1339 if $_[0]{query_dialog};
1340}
1341
1342# FIXME: a very ugly hack to wait for stat update look below! #d#
1343our $QUERY_TIMER; #d#
1344
1345# server query dialog
1346sub server_query {
1347 my ($conn, $flags, $prompt) = @_;
1348
1349 # FIXME: a very ugly hack to wait for stat update #d#
1350 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
1351 unless ($QUERY_TIMER) {
1352 $QUERY_TIMER =
1353 Event->timer (
1354 after => 1,
1355 cb => sub {
1356 server_query ($conn, $flags, $prompt, 1);
1357 $QUERY_TIMER = undef
1358 }
1359 );
1360 return;
1361 }
1362 }
1363
1364 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
1365 x => "center",
1366 y => "center",
1367 title => "Server Query",
1368 child => my $vbox = new CFPlus::UI::VBox,
1369 ;
1370
1371 my @dialog = my $label = new CFPlus::UI::Label
1372 max_w => $::WIDTH * 0.8,
1373 ellipsise => 0,
1374 text => $prompt;
1375
1376 if ($flags & CS_QUERY_YESNO) {
1377 push @dialog, my $hbox = new CFPlus::UI::HBox;
1378
1379 $hbox->add (new CFPlus::UI::Button
1380 text => "No",
1381 on_activate => sub {
1382 $conn->send ("reply n");
1383 $dialog->destroy;
1384 0
1385 }
1386 );
1387 $hbox->add (new CFPlus::UI::Button
1388 text => "Yes",
1389 on_activate => sub {
1390 $conn->send ("reply y");
1391 destroy_query_dialog $conn;
1392 0
1393 },
1394 );
1395
1396 $dialog->grab_focus;
1397
1398 } elsif ($flags & CS_QUERY_SINGLECHAR) {
1399 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
1400 $dialog->{tooltip} = "#charcreation_focus";
1401
1402 unshift @dialog, new CFPlus::UI::Label
1403 max_w => $::WIDTH * 0.8,
1404 ellipsise => 0,
1405 markup => "\nOr use your keyboard and the text entry below:\n";
1406
1407 unshift @dialog, my $table = new CFPlus::UI::Table;
1408
1409 $table->add_at (0, 0, new CFPlus::UI::Button
1410 text => "Next Race",
1411 on_activate => sub {
1412 $conn->send ("reply n");
1413 destroy_query_dialog $conn;
1414 0
1415 },
1416 );
1417 $table->add_at (2, 0, new CFPlus::UI::Button
1418 text => "Accept",
1419 on_activate => sub {
1420 $conn->send ("reply d");
1421 destroy_query_dialog $conn;
1422 0
1423 },
1424 );
1425
1426 if ($conn->{chargen_race_description}) {
1427 unshift @dialog, new CFPlus::UI::Label
1428 max_w => $::WIDTH * 0.8,
1429 ellipsise => 0,
1430 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
1431 ;
1432 }
1433
1434 unshift @dialog, new CFPlus::UI::Face
1435 face => $conn->{player}{face},
1436 bg => [.2, .2, .2, 1],
1437 min_w => 64,
1438 min_h => 64,
1439 ;
1440
1441 if ($conn->{chargen_race_title}) {
1442 unshift @dialog, new CFPlus::UI::Label
1443 allign => 1,
1444 ellipsise => 0,
1445 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
1446 ;
1447 }
1448
1449 unshift @dialog, new CFPlus::UI::Label
1450 max_w => $::WIDTH * 0.4,
1451 ellipsise => 0,
1452 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
1453 ;
1454
1455 } elsif ($prompt =~ /roll new stats/) {
1456 if (my $stat = delete $conn->{stat_change_with}) {
1457 $conn->send ("reply $stat");
1458 destroy_query_dialog $conn;
1459 return;
1460 }
1461
1462 unshift @dialog, new CFPlus::UI::Label
1463 max_w => $::WIDTH * 0.4,
1464 ellipsise => 0,
1465 markup => "\nOr use your keyboard and the text entry below:\n";
1466
1467 unshift @dialog, my $table = new CFPlus::UI::Table;
1468
1469 # left: re-roll
1470 $table->add_at (0, 0, new CFPlus::UI::Button
1471 text => "Roll Again",
1472 on_activate => sub {
1473 $conn->send ("reply y");
1474 destroy_query_dialog $conn;
1475 0
1476 },
1477 );
1478
1479 # center: swap stats
1480 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
1481 expand => 1,
1482 value => $_,
1483 options => [
1484 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
1485 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
1486 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
1487 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
1488 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
1489 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
1490 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
1491 ],
1492 ), 1 .. 2;
1493
1494 $table->add_at (2, 0, new CFPlus::UI::Button
1495 text => "Swap Stats",
1496 on_activate => sub {
1497 $conn->{stat_change_with} = $sw2->{value};
1498 $conn->send ("reply $sw1->{value}");
1499 destroy_query_dialog $conn;
1500 0
1501 },
1502 );
1503 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
1504
1505 # right: accept
1506 $table->add_at (4, 0, new CFPlus::UI::Button
1507 text => "Accept",
1508 on_activate => sub {
1509 $conn->send ("reply n");
1510 $STATS_PAGE->hide;
1511 destroy_query_dialog $conn;
1512 0
1513 },
1514 );
1515
1516 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
1517 for (
1518 [Str => CS_STAT_STR],
1519 [Dex => CS_STAT_DEX],
1520 [Con => CS_STAT_CON],
1521 [Int => CS_STAT_INT],
1522 [Wis => CS_STAT_WIS],
1523 [Pow => CS_STAT_POW],
1524 [Cha => CS_STAT_CHA],
1525 ) {
1526 my ($name, $id) = @$_;
1527 $hbox->add (new CFPlus::UI::Label
1528 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
1529 align => 0,
1530 expand => 1,
1531 can_events => 1,
1532 can_hover => 1,
1533 tooltip => "#stat_$name",
1534 );
1535 }
1536
1537 unshift @dialog, new CFPlus::UI::Label
1538 max_w => $::WIDTH * 0.4,
1539 ellipsise => 0,
1540 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
1541 ;
1542 }
1543
1544 push @dialog, my $entry = new CFPlus::UI::Entry
1545 on_changed => sub {
1546 $conn->send ("reply $_[1]");
1547 destroy_query_dialog $conn;
1548 0
1549 },
1550 ;
1551
1552 $entry->grab_focus;
1553
1554 } else {
1555 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1556
1557 push @dialog, my $entry = new CFPlus::UI::Entry
1558 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
1559 on_activate => sub {
1560 $conn->send ("reply $_[1]");
1561 destroy_query_dialog $conn;
1562 0
1563 },
1564 ;
1565
1566 $entry->grab_focus;
1567 }
1568
1569 $vbox->add (@dialog);
1570 $dialog->show;
1571}
1572
1573sub start_game {
1574 status "logging in...";
1575
1576 $LOGIN_BUTTON->set_text ("Logout");
1577 $SETUP_DIALOG->hide;
1578
1579 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
1580
1581 my ($host, $port) = split /:/, $PROFILE->{host};
1582
1583 $MAP = new CFPlus::Map;
1584
1585 $CONN = eval {
1586 new CFPlus::Protocol
1587 host => $host,
1588 port => $port || 13327,
1589 user => $PROFILE->{user},
1590 pass => $PROFILE->{password},
1591 mapw => $mapsize,
1592 maph => $mapsize,
1593
1594 client => "cfplus $CFPlus::VERSION $] $^O",
1595
1596 map_widget => $MAPWIDGET,
1597 logview => $LOGVIEW,
1598 statusbox => $STATUSBOX,
1599 map => $MAP,
1600 mapmap => $MAPMAP,
1601 query => \&server_query,
1602
1603 setup_req => {
1604 smoothing => $CFG->{map_smoothing}*1,
1605 },
1606
1607 sound_play => sub {
1608 my ($x, $y, $soundnum, $type) = @_;
1609
1610 $SDL_MIXER
1611 or return;
1612
1613 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1614 or return;
1615
1616 $chunk->play;
1617 },
1618 };
1619
1620 if ($CONN) {
1621 CFPlus::lowdelay fileno $CONN->{fh};
1622
1623 status "login successful";
1624 } else {
1625 status "unable to connect";
1626 stop_game();
1627 }
1628}
1629
1630sub stop_game {
1631 $LOGIN_BUTTON->set_text ("Login");
1632 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
1633 $SETUP_DIALOG->show;
1634 $PL_WINDOW->hide;
1635 $SPELL_LIST->clear_spells;
1636 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
1637
1638 &audio_music_set ([]);
1639
1640 return unless $CONN;
1641
1642 status "connection closed";
1643
1644 destroy_query_dialog $CONN;
1645 $CONN->destroy;
1646 $CONN = 0; # false, does not autovivify
1647
1648 undef $MAP;
1649}
1650
1651sub graphics_setup {
1652 my $vbox = new CFPlus::UI::VBox;
1653
1654 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
1655
1656 my $row = 0;
1657
1658 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
1659 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
1660 can_events => 1,
1661 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
1662
1663 my $vidmode_tooltip =
1664 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
1665 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
1666
1667 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
1668 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
1669
1670 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
1671 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
1672 tooltip => $vidmode_tooltip);
1673 $hbox->add (my $mode_label = new CFPlus::UI::Label
1674 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
1675 can_events => 1, tooltip => $vidmode_tooltip);
1676
1677 $mode_slider->connect (changed => sub {
1678 my ($self, $value) = @_;
1679
1680 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
1681 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
1682 });
1683 $mode_slider->emit (changed => $mode_slider->{range}[0]);
1684
1685 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
1686 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
1687 state => $CFG->{fullscreen},
1688 tooltip => "Bring the client into fullscreen mode.",
1689 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
1690 );
1691
1692 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
1693 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1694 state => $CFG->{fast},
1695 tooltip => "Lower the visual quality considerably to speed up rendering.",
1696 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
1697 );
1698
1699 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
1700 $table->add_at (1, $row++, new CFPlus::UI::Slider
1701 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
1702 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
1703 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
1704 );
1705
1706 $table->add_at (1, $row++, new CFPlus::UI::Button
1707 expand => 1, align => 0, text => "Apply",
1708 tooltip => "Apply the video settings above.",
1709 on_activate => sub {
1710 video_shutdown ();
1711 video_init ();
1712 0
1713 }
1714 );
1715
1716 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
1717 $table->add_at (1, $row++, new CFPlus::UI::Slider
1718 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1719 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1720 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
1721 );
1722
1723 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
1724 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1725 state => $CFG->{map_smoothing},
1726 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
1727 . "This increases load on the graphics subsystem and works only with 2.x servers. "
1728 . "Changes take effect at next connection only.",
1729 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1730 );
1731
1732 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
1733 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1734 state => $CFG->{fow_enable},
1735 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1736 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1737 );
1738
1739 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
1740 $table->add_at (1, $row++, new CFPlus::UI::Slider
1741 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1742 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
1743 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1744 );
1745
1746 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
1747 $table->add_at (1, $row++, new CFPlus::UI::Slider
1748 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1749 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
1750 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
1751 );
1752
1753 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
1754 $table->add_at (1, $row++, new CFPlus::UI::Slider
1755 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1756 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
1757 on_changed => sub {
1758 $CFG->{gauge_fontsize} = $_[1];
1759 &set_gauge_window_fontsize;
1760 0
1761 }
1762 );
1763
1764 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
1765 $table->add_at (1, $row++, new CFPlus::UI::Slider
1766 range => [$CFG->{gauge_size}, 0.2, 0.8],
1767 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1768 on_changed => sub {
1769 $CFG->{gauge_size} = $_[1];
1770 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1771 0
1772 }
1773 );
1774
1775 $vbox
1776}
1777
1778sub audio_setup {
1779 my $vbox = new CFPlus::UI::VBox;
1780
1781 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
1782
1783 my $row = 0;
1784
1785 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
1786 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1787 state => $CFG->{audio_enable},
1788 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
1789 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
1790 );
1791# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
1792# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
1793# $CFG->{effects_volume} = $_[1];
1794# });
1795 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
1796 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
1797 $hbox->add (new CFPlus::UI::CheckBox
1798 expand => 1, state => $CFG->{bgm_enable},
1799 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
1800 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
1801 );
1802 $hbox->add (new CFPlus::UI::Slider
1803 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
1804 tooltip => "The volume of the background music. Changes are instant.",
1805 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
1806 );
1807
1808 $table->add_at (1, $row++, new CFPlus::UI::Button
1809 expand => 1, align => 0, text => "Apply",
1810 tooltip => "Apply the audio settings",
1811 on_activate => sub {
1812 audio_shutdown ();
1813 audio_init ();
1814 0
1815 }
1816 );
1817
1818 $vbox
1819}
1820
1821sub set_gauge_window_fontsize {
1822 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
1823 $_->set_fontsize ($::CFG->{gauge_fontsize});
1824 }
1825}
1826
1827sub make_gauge_window {
1828 my $gh = int $HEIGHT * $CFG->{gauge_size};
1829
1830 my $win = new CFPlus::UI::Frame (
1831 force_x => 0,
1832 force_y => "max",
1833 force_w => $WIDTH,
1834 force_h => $gh,
1835 );
1836
1837 $win->add (my $hbox = new CFPlus::UI::HBox
1838 children => [
1839 (new CFPlus::UI::HBox expand => 1),
1840 (new CFPlus::UI::VBox children => [
1841 (new CFPlus::UI::Empty expand => 1),
1842 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
1843 ]),
1844 (my $vbox = new CFPlus::UI::VBox),
1845 ],
1846 );
1847
1848 $vbox->add (new CFPlus::UI::HBox
1849 expand => 1,
1850 children => [
1851 (new CFPlus::UI::Empty expand => 1),
1852 (my $hb = new CFPlus::UI::HBox),
1853 ],
1854 );
1855
1856 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
1857 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1858 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1859 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
1860
1861 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1862 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1863
1864 $GAUGES = {
1865 exp => $exp, win => $win, range => $rng,
1866 food => $fg, mana => $mg, hp => $hg, grace => $gg
1867 };
1868
1869 &set_gauge_window_fontsize;
1870
1871 $win
1872}
1873
1874sub debug_setup {
1875 my $table = new CFPlus::UI::Table;
1876
1877 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
1878 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
1879 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
1880 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
1881 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
1882 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1883 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
1884 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1885 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
1886
1887 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
1888
1889 $table
1890}
1891
1892sub stats_window {
1893 my $r = new CFPlus::UI::ScrolledWindow (
1894 expand => 1,
1895 scroll_y => 1
1896 );
1897 $r->add (my $vb = new CFPlus::UI::VBox);
1898
1899 $vb->add (new CFPlus::UI::FancyFrame
1900 label => "Player",
1901 child => (my $pi = new CFPlus::UI::VBox),
1902 );
1903
1904 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
1905 can_hover => 1, can_events => 1,
1906 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1907 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
1908 can_hover => 1, can_events => 1,
1909 tooltip => "The map you are currently on (if supported by the server).");
1910
1911 $pi->add (my $hb0 = new CFPlus::UI::HBox);
1912 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
1913 can_hover => 1, can_events => 1,
1914 tooltip => "The weight of the player including all inventory items.");
1915 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
1916 can_hover => 1, can_events => 1,
1917 tooltip => "The weight limit: you cannot carry more than this.");
1918
1919 $vb->add (new CFPlus::UI::FancyFrame
1920 label => "Primary/Secondary Statistics",
1921 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1922 );
1923 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
1924
1925 my $color2 = [1, 1, 0];
1926
1927 for (
1928 [0, 0, st_str => "Str", 30],
1929 [0, 1, st_dex => "Dex", 30],
1930 [0, 2, st_con => "Con", 30],
1931 [0, 3, st_int => "Int", 30],
1932 [0, 4, st_wis => "Wis", 30],
1933 [0, 5, st_pow => "Pow", 30],
1934 [0, 6, st_cha => "Cha", 30],
1935
1936 [2, 0, st_wc => "Wc", -120],
1937 [2, 1, st_ac => "Ac", -120],
1938 [2, 2, st_dam => "Dam", 120],
1939 [2, 3, st_arm => "Arm", 120],
1940 [2, 4, st_spd => "Spd", 10.54],
1941 [2, 5, st_wspd => "WSp", 10.54],
1942 ) {
1943 my ($col, $row, $id, $label, $template) = @$_;
1944
1945 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
1946 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
1947 align => +1, template => $template, tooltip => "#stat_$label");
1948 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
1949 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
1950 align => -1, text => $label, tooltip => "#stat_$label");
1951 }
1952
1953 $vb->add (new CFPlus::UI::FancyFrame
1954 label => "Resistancies",
1955 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1956 );
1957
1958 my $row = 0;
1959 my $col = 0;
1960
1961 my %resist_names = (
1962 slow => ["Slow",
1963 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
1964 holyw => ["Holy Word",
1965 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
1966 conf => ["Confusion",
1967 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
1968 fire => ["Fire",
1969 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
1970 depl => ["Depletion",
1971 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
1972 magic => ["Magic",
1973 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
1974 drain => ["Draining",
1975 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
1976 acid => ["Acid",
1977 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
1978 pois => ["Poison",
1979 "<b>Poison</b> (resistance to getting poisoned)"],
1980 para => ["Paralysation",
1981 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
1982 deat => ["Death",
1983 "<b>Death</b> (resistance against death spells)"],
1984 phys => ["Physical",
1985 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
1986 blind => ["Blind",
1987 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
1988 fear => ["Fear",
1989 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
1990 tund => ["Turn undead",
1991 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
1992 elec => ["Electricity",
1993 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
1994 cold => ["Cold",
1995 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
1996 ghit => ["Ghost hit",
1997 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
1998 );
1999 for (qw/slow holyw conf fire depl magic
2000 drain acid pois para deat phys
2001 blind fear tund elec cold ghit/)
2002 {
2003 $tbl2->add ($col, $row,
2004 $STATWIDS->{"res_$_"} =
2005 new CFPlus::UI::Label
2006 font => $FONT_FIXED,
2007 template => "-100%",
2008 align => +1,
2009 valign => 0,
2010 can_events => 1,
2011 can_hover => 1,
2012 tooltip => $resist_names{$_}->[1],
2013 );
2014 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
2015 font => $FONT_FIXED,
2016 can_hover => 1,
2017 can_events => 1,
2018 path => "ui/resist/resist_$_.png",
2019 tooltip => $resist_names{$_}->[1],
2020 );
2021 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
2022 text => $resist_names{$_}->[0],
2023 font => $FONT_FIXED,
2024 can_hover => 1,
2025 can_events => 1,
2026 tooltip => $resist_names{$_}->[1],
2027 );
2028
2029 $row++;
2030 if ($row % 6 == 0) {
2031 $col += 3;
2032 $row = 0;
2033 }
2034 }
2035
2036 #update_stats_window ({});
2037
2038 $r
2039}
2040
2041sub skill_window {
2042 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
2043 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
2044 $sw
2045}
2046
2047sub formsep($) {
2048 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
2049}
2050
2051my $METASERVER_ATIME;
2052
2053sub update_metaserver {
2054 my ($metaserver_dialog) = @_;
2055
2056 $METASERVER = $metaserver_dialog
2057 if defined $metaserver_dialog;
2058
2059 return if $METASERVER_ATIME > time;
2060 $METASERVER_ATIME = time + 60;
2061
2062 my $table = $METASERVER->{table};
2063 $table->clear;
2064 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
2065
2066 my $ok = 0;
2067
2068 CFPlus::background {
2069 my $ua = CFPlus::lwp_useragent;
2070
2071 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
2072 } sub {
2073 my ($msg) = @_;
2074 if ($msg) {
2075 $table->clear;
2076
2077 my @tip = (
2078 "The current number of users logged in on the server.",
2079 "The hostname of the server.",
2080 "The time this server has been running without being restarted.",
2081 "The server software version - a '+' indicates a Crossfire+ server.",
2082 "Short information about this server provided by its admins.",
2083 );
2084 my @col = qw(#Users Host Uptime Version Description);
2085 $table->add_at ($_, 0, new CFPlus::UI::Label
2086 can_hover => 1, can_events => 1,
2087 align => 0, fg => [1, 1, 0],
2088 text => $col[$_], tooltip => $tip[$_])
2089 for 0 .. $#col;
2090
2091 my @align = qw(1 0 1 1 -1);
2092
2093 my $y = 0;
2094 for my $m (@{ $msg->{servers} }) {
2095 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
2096 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
2097
2098 for ($desc) {
2099 s/<br>/\n/gi;
2100 s/<li>/\n· /gi;
2101 s/<.*?>//sgi;
2102 s/&amp;/&/g;
2103 s/&lt;/</g;
2104 s/&gt;/>/g;
2105 }
2106
2107 $uptime = sprintf "%dd %02d:%02d:%02d",
2108 (int $uptime / 86400),
2109 (int $uptime / 3600) % 24,
2110 (int $uptime / 60) % 60,
2111 $uptime % 60;
2112
2113 $m = [$users, $host, $uptime, $version, $desc];
2114
2115 $y++;
2116
2117 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
2118 (new CFPlus::UI::Button
2119 text => "Use",
2120 tooltip => "Put this server into the <b>Host:Port</b> field",
2121 on_activate => sub {
2122 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
2123 $METASERVER->hide;
2124 0
2125 },
2126 ),
2127 (new CFPlus::UI::Empty expand => 1),
2128 ]);
2129
2130 $table->add_at ($_, $y, new CFPlus::UI::Label
2131 max_w => $::WIDTH * 0.4,
2132 ellipsise => 0,
2133 align => $align[$_],
2134 text => $m->[$_],
2135 tooltip => $tip[$_],
2136 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
2137 can_hover => 1,
2138 can_events => 1,
2139 fontsize => 0.8)
2140 for 0 .. $#$m;
2141 }
2142 } else {
2143 $ok or $label->set_text ("error while contacting metaserver");
2144 }
2145 };
2146
2147}
2148
2149sub metaserver_dialog {
2150 my $vbox = new CFPlus::UI::VBox;
2151 my $table = new CFPlus::UI::Table;
2152 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
2153
2154 my $dialog = new CFPlus::UI::Toplevel
2155 title => "Server List",
2156 name => 'metaserver_dialog',
2157 x => 'center',
2158 y => 'center',
2159 z => 3,
2160 force_w => $::WIDTH * 0.9,
2161 force_h => $::HEIGHT * 0.7,
2162 child => $vbox,
2163 has_close_button => 1,
2164 table => $table,
2165 on_visibility_change => sub {
2166 update_metaserver ($_[0]) if $_[1];
2167 0
2168 },
2169 ;
2170
2171 $dialog
2172}
2173
2174sub server_setup {
2175 my $vbox = new CFPlus::UI::VBox;
2176
2177 $vbox->add (new CFPlus::UI::FancyFrame
2178 label => "Connection Settings",
2179 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
2180 );
2181 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
2182
2183 {
2184 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
2185
2186 $vbox->add (
2187 $HOST_ENTRY = new CFPlus::UI::Entry
2188 expand => 1,
2189 text => $CFG->{profile}{default}{host},
2190 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
2191 on_changed => sub {
2192 my ($self, $value) = @_;
2193 $CFG->{profile}{default}{host} = $value;
2194 0
2195 }
2196 );
2197
2198 $vbox->add (new CFPlus::UI::Button
2199 expand => 1,
2200 text => "Server List",
2201 other => $METASERVER,
2202 tooltip => "Show a list of available crossfire servers",
2203 on_activate => sub { $METASERVER->toggle_visibility; 0 },
2204 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
2205 );
2206 }
2207
2208 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
2209 $table->add_at (1, 4, new CFPlus::UI::Entry
2210 text => $CFG->{profile}{default}{user},
2211 tooltip => "The name of your character on the server",
2212 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
2213 );
2214
2215 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
2216 $table->add_at (1, 5, new CFPlus::UI::Entry
2217 text => $CFG->{profile}{default}{password},
2218 hidden => 1,
2219 tooltip => "The password for your character",
2220 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
2221 );
2222
2223 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
2224 $table->add_at (1, 7, new CFPlus::UI::Slider
2225 force_w => 100,
2226 range => [$CFG->{mapsize}, 10, 100, 0, 1],
2227 tooltip => "This is the size of the portion of the map update the server sends you. "
2228 . "If you set this to a high value you will be able to see further, "
2229 . "but you also increase bandwidth requirements and latency. "
2230 . "This option is only used once at log-in.",
2231 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
2232 );
2233
2234 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
2235 $table->add_at (1, 8, new CFPlus::UI::CheckBox
2236 state => $CFG->{face_prefetch},
2237 tooltip => "<b>Background Image Prefetch</b>\n\n"
2238 . "If enabled, the client automatically pre-fetches images from the server. "
2239 . "This might increase or create lag, but increases the chances "
2240 . "of faces being ready for display when you encounter them. "
2241 . "It also uses up server bandwidth on every connect, "
2242 . "so only set it if you really need to prefetch images. "
2243 . "This option can be set and unset any time.",
2244 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
2245 );
2246
2247 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
2248 $table->add_at (1, 9, new CFPlus::UI::Entry
2249 text => $CFG->{output_rate},
2250 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
2251 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
2252 . "default will be used, which is usually around 100kb/s.",
2253 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
2254 );
2255
2256 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
2257 $table->add_at (1, 10, new CFPlus::UI::Entry
2258 text => $CFG->{output_count},
2259 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
2260 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
2261 );
2262
2263 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
2264 $table->add_at (1, 11, new CFPlus::UI::Entry
2265 text => $CFG->{output_sync},
2266 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
2267 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
2268 );
2269
2270 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
2271 expand => 1,
2272 align => 0,
2273 text => "Login",
2274 on_activate => sub {
2275 $CONN ? stop_game
2276 : start_game;
2277 0
2278 },
2279 );
2280
2281 $vbox->add (new CFPlus::UI::FancyFrame
2282 label => "Server Info",
2283 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
2284 );
2285
2286 $vbox
2287}
2288
2289sub client_setup {
2290 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
2291
2292 my $row = 0;
2293
2294 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
2295 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
2296 text => $CFG->{say_command},
2297 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. "
2298 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
2299 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
2300 on_changed => sub {
2301 my ($self, $value) = @_;
2302 $CFG->{say_command} = $value;
2303 0
2304 }
2305 );
2306
2307 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
2308 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
2309 state => $CFG->{show_tips},
2310 tooltip => "Show the <b>Tip of the day</b> window at startup?",
2311 on_changed => sub {
2312 my ($self, $value) = @_;
2313 $CFG->{show_tips} = $value;
2314 0
2315 }
2316 );
2317
2318 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
2319 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
2320 text => $CFG->{logview_max_par},
2321 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
2322 . "sends more messages than this number, older messages get removed to save memory and "
2323 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
2324 on_changed => sub {
2325 my ($self, $value) = @_;
2326 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
2327 0
2328 },
2329 );
2330
2331 $table
2332}
2333
2334sub message_window {
2335 my $window = new CFPlus::UI::Toplevel
2336 name => "message_window",
2337 title => "Messages",
2338 border_bg => [1, 1, 1, 1],
2339 x => "max",
2340 y => 0,
2341 force_w => $::WIDTH * 0.4,
2342 force_h => $::HEIGHT * 0.5,
2343 child => (my $vbox = new CFPlus::UI::VBox),
2344 has_close_button => 1;
2345
2346 $vbox->add ($LOGVIEW);
2347
2348 $vbox->add (my $input = new CFPlus::UI::Entry
2349 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
2350 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
2351 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
2352 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
2353 on_focus_in => sub {
2354 my ($input, $prev_focus) = @_;
2355
2356 delete $input->{refocus_map};
2357
2358 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
2359 $input->{refocus_map} = 1;
2360 }
2361 delete $input->{auto_activated};
2362
2363 0
2364 },
2365 on_activate => sub {
2366 my ($input, $text) = @_;
2367 $input->set_text ('');
2368
2369 if ($text =~ /^\/(.*)/) {
2370 $::CONN->user_send ($1);
2371 } else {
2372 my $say_cmd = $::CFG->{say_command} || 'say';
2373 $::CONN->user_send ("$say_cmd $text");
2374 }
2375 if ($input->{refocus_map}) {
2376 delete $input->{refocus_map};
2377 $MAPWIDGET->focus_in
2378 }
2379
2380 0
2381 },
2382 on_escape => sub {
2383 $MAPWIDGET->grab_focus;
2384
2385 0
2386 },
2387 );
2388
2389 $CONSOLE = {
2390 window => $window,
2391 input => $input,
2392 };
2393
2394 $window
2395}
2396
2397sub autopickup_setup {
2398 my $r = new CFPlus::UI::ScrolledWindow (
2399 expand => 1,
2400 scroll_y => 1
2401 );
2402 $r->add (my $table = new CFPlus::UI::Table
2403 row_expand => [0],
2404 col_expand => [0, 1, 0, 1],
2405 );
2406
2407 for (
2408 ["General", 0, 0,
2409 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
2410 ["Inhibit autopickup" => PICKUP_INHIBIT],
2411 ["Stop before pickup" => PICKUP_STOP],
2412 ["Debug autopickup" => PICKUP_DEBUG],
2413 ],
2414 ["Weapons", 0, 6,
2415 ["All weapons" => PICKUP_ALLWEAPON],
2416 ["Missile weapons" => PICKUP_MISSILEWEAPON],
2417 ["Bows" => PICKUP_BOW],
2418 ["Arrows" => PICKUP_ARROW],
2419 ],
2420 ["Armour", 0, 12,
2421 ["Helmets" => PICKUP_HELMET],
2422 ["Shields" => PICKUP_SHIELD],
2423 ["Body Armour" => PICKUP_ARMOUR],
2424 ["Boots" => PICKUP_BOOTS],
2425 ["Gloves" => PICKUP_GLOVES],
2426 ["Cloaks" => PICKUP_CLOAK],
2427 ],
2428
2429 ["Readables", 2, 0,
2430 ["Spellbooks" => PICKUP_SPELLBOOK],
2431 ["Skillscrolls" => PICKUP_SKILLSCROLL],
2432 ["Normal Books/Scrolls" => PICKUP_READABLES],
2433 ],
2434 ["Misc", 2, 5,
2435 ["Food" => PICKUP_FOOD],
2436 ["Drinks" => PICKUP_DRINK],
2437 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
2438 ["Keys" => PICKUP_KEY],
2439 ["Magical Items" => PICKUP_MAGICAL],
2440 ["Potions" => PICKUP_POTION],
2441 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
2442 ["Ignore cursed" => PICKUP_NOT_CURSED],
2443 ["Jewelery" => PICKUP_JEWELS],
2444 ["Flesh" => PICKUP_FLESH],
2445 ],
2446 ["Weight/Value ratio", 2, 17]
2447 )
2448 {
2449 my ($title, $x, $y, @bits) = @$_;
2450 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
2451
2452 for (@bits) {
2453 ++$y;
2454
2455 my $mask = $_->[1];
2456 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
2457 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
2458 state => $::CFG->{pickup} & $mask,
2459 on_changed => sub {
2460 my ($box, $value) = @_;
2461
2462 if ($value) {
2463 $::CFG->{pickup} |= $mask;
2464 } else {
2465 $::CFG->{pickup} &= ~$mask;
2466 }
2467
2468 $::CONN->send_command ("pickup $::CFG->{pickup}")
2469 if defined $::CONN;
2470
2471 0
2472 });
2473
2474 ${$_->[2]} = $checkbox if $_->[2];
2475 }
2476 }
2477
2478 $table->add_at (2, 18, new CFPlus::UI::ValSlider
2479 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
2480 template => ">= 99",
2481 to_value => sub { ">= " . 5 * $_[0] },
2482 on_changed => sub {
2483 my ($slider, $value) = @_;
2484
2485 $::CFG->{pickup} &= ~0xF;
2486 $::CFG->{pickup} |= int $value
2487 if $value;
2488 1;
2489 });
2490
2491 $table->add_at (3, 18, new CFPlus::UI::Button
2492 text => "set",
2493 on_activate => sub {
2494 $::CONN->send_command ("pickup $::CFG->{pickup}")
2495 if defined $::CONN;
2496 0
2497 });
2498
2499 $r
2500}
2501
2502my %SORT_ORDER = (
2503 type => undef,
2504 mtime => sub {
2505 my $NOW = time;
2506 sort {
2507 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
2508 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
2509
2510 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
2511 or $btime <=> $atime
2512 or $a->{type} <=> $b->{type}
2513 } @_
2514 },
2515 weight => sub { sort {
2516 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
2517 or $a->{type} <=> $b->{type}
2518 } @_ },
2519);
2520
2521sub inventory_widget {
2522 my $hb = new CFPlus::UI::HBox homogeneous => 1;
2523
2524 $hb->add (my $vb1 = new CFPlus::UI::VBox);
2525 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
2526
2527 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
2528
2529 use sort 'stable';
2530
2531 $hb1->add (new CFPlus::UI::Selector
2532 value => $::CFG->{inv_sort},
2533 options => [
2534 [type => "Type/Name"],
2535 [mtime => "Recent/Normal/Locked"],
2536 [weight => "Weight/Type"],
2537 ],
2538 on_changed => sub {
2539 $::CFG->{inv_sort} = $_[1];
2540 $INV->set_sort_order ($SORT_ORDER{$_[1]});
2541 },
2542 );
2543 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
2544 #TODO# update to weigh/maxweight
2545 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
2546
2547 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
2548 $sw1->add ($INV = new CFPlus::UI::Inventory);
2549 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
2550
2551 $hb->add (my $vb2 = new CFPlus::UI::VBox);
2552
2553 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
2554
2555 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
2556 $sw2->add ($INVR = new CFPlus::UI::Inventory);
2557
2558 # XXX: Call after $INVR = ... because set_opencont sets the items
2559 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
2560
2561 $hb
2562}
2563
2564sub toggle_player_page {
2565 my ($widget) = @_;
2566
2567 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
2568 $PL_WINDOW->hide;
2569 } else {
2570 $PL_NOTEBOOK->set_current_page ($widget);
2571 $PL_WINDOW->show;
2572 }
2573}
2574
2575sub player_window {
2576 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
2577 x => "center",
2578 y => "center",
2579 force_w => $WIDTH * 9/10,
2580 force_h => $HEIGHT * 9/10,
2581 title => "Player",
2582 name => "playerbook",
2583 has_close_button => 1
2584 ;
2585
2586 my $ntb =
2587 $PL_NOTEBOOK =
2588 new CFPlus::UI::Notebook expand => 1;
2589
2590 $ntb->add (
2591 "Statistics (F2)" => $STATS_PAGE = stats_window,
2592 "Shows statistics, where all your Stats and Resistances are shown."
2593 );
2594 $ntb->add (
2595 "Skills (F3)" => $SKILL_PAGE = skill_window,
2596 "Shows all your Skills."
2597 );
2598
2599 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
2600 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
2601 $ntb->add (
2602 "Spellbook (F4)" => $spellsw,
2603 "Displays all spells you have and lets you edit keyboard shortcuts for them."
2604 );
2605 $ntb->add (
2606 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
2607 "Toggles the inventory window, where you can manage your loot (or treasures :). "
2608 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
2609 );
2610 $ntb->add (Pickup => autopickup_setup,
2611 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
2612
2613 $ntb->set_current_page ($INVENTORY_PAGE);
2614
2615 $plwin->add ($ntb);
2616 $plwin
2617}
2618
2619sub keyboard_setup {
2620 CFPlus::Macro::keyboard_setup
2621}
2622
2623sub help_window {
2624 my $win = new CFPlus::UI::Toplevel
2625 x => 'center',
2626 y => 'center',
2627 z => 4,
2628 name => 'doc_browser',
2629 force_w => int $WIDTH * 7/8,
2630 force_h => int $HEIGHT * 7/8,
2631 title => "Help Browser",
2632 has_close_button => 1;
2633
2634 $win->add (my $vbox = new CFPlus::UI::VBox);
2635
2636 $vbox->add (new CFPlus::UI::FancyFrame
2637 label => "Navigation",
2638 child => (my $buttons = new CFPlus::UI::HBox),
2639 );
2640 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
2641 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2642
2643 my @history;
2644 my @future;
2645 my $curnode;
2646
2647 my $load_node; $load_node = sub {
2648 my ($node, $para) = @_;
2649
2650 $buttons->clear;
2651
2652 $buttons->add (new CFPlus::UI::Button
2653 text => "⇤",
2654 tooltip => "back to the starting page",
2655 on_activate => sub {
2656 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
2657 unshift @future, @history;
2658 @history = ();
2659 $load_node->(@{shift @future});
2660 },
2661 );
2662
2663 if (@history) {
2664 $buttons->add (new CFPlus::UI::Button
2665 text => "⋘",
2666 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
2667 on_activate => sub {
2668 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
2669 $load_node->(@{pop @history});
2670 },
2671 );
2672 }
2673
2674 if (@future) {
2675 $buttons->add (new CFPlus::UI::Button
2676 text => "â‹™",
2677 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
2678 on_activate => sub {
2679 push @history, [$curnode, $viewer->current_paragraph];
2680 $load_node->(@{shift @future});
2681 },
2682 );
2683 }
2684
2685 $buttons->add (new CFPlus::UI::Label text => " ");
2686
2687 my @path = CFPlus::Pod::full_path_of $node;
2688 pop @path; # drop current node
2689
2690 for my $node (@path) {
2691 $buttons->add (new CFPlus::UI::Button
2692 text => $node->{kw}[0],
2693 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
2694 on_activate => sub {
2695 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
2696 $load_node->($node);
2697 },
2698 );
2699 $buttons->add (new CFPlus::UI::Label text => "/");
2700 }
2701
2702 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
2703
2704 $curnode = $node;
2705
2706 $viewer->clear;
2707 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
2708 $viewer->scroll_to ($para);
2709 };
2710
2711 $load_node->(CFPlus::Pod::find pod => "mainpage");
2712
2713 $CFPlus::Pod::goto_document = sub {
2714 my (@path) = @_;
2715
2716 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
2717
2718 $load_node->((CFPlus::Pod::find @path)[0]);
2719 $win->show;
2720 };
2721
2722 $win
2723}
2724
2725sub open_string_query {
2726 my ($title, $cb, $txt, $tooltip) = @_;
2727 my $dialog = new CFPlus::UI::Toplevel
2728 x => "center",
2729 y => "center",
2730 z => 50,
2731 force_w => $WIDTH * 4/5,
2732 title => $title;
2733
2734 $dialog->add (
2735 my $e = new CFPlus::UI::Entry
2736 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2737 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2738 tooltip => $tooltip
2739 );
2740
2741 $e->grab_focus;
2742 $e->set_text ($txt) if $txt;
2743 $dialog->show;
2744}
2745
2746sub open_quit_dialog {
2747 unless ($QUIT_DIALOG) {
2748 $QUIT_DIALOG = new CFPlus::UI::Toplevel
2749 x => "center",
2750 y => "center",
2751 z => 50,
2752 title => "Really Quit?",
2753 on_key_down => sub {
2754 my ($dialog, $ev) = @_;
2755 $ev->{sym} == 27 and $dialog->hide;
2756 }
2757 ;
2758
2759 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
2760
2761 $vb->add (new CFPlus::UI::Label
2762 text => "You should find a savebed and apply it first!",
2763 max_w => $WIDTH * 0.25,
2764 ellipsize => 0,
2765 );
2766 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2767 $hb->add (new CFPlus::UI::Button
2768 text => "Ok",
2769 expand => 1,
2770 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2771 );
2772 $hb->add (new CFPlus::UI::Button
2773 text => "Quit anyway",
2774 expand => 1,
2775 on_activate => sub { exit },
2776 );
2777 }
2778
2779 $QUIT_DIALOG->show;
2780 $QUIT_DIALOG->grab_focus;
2781}
2782
2783sub show_tip_of_the_day {
2784 # find all tips
2785 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
2786
2787 CFPlus::DB::get state => "tip_of_the_day", sub {
2788 my ($todindex) = @_;
2789 $todindex = 0 if $todindex >= @tod;
2790 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2791
2792 # create dialog
2793 my $dialog;
2794
2795 my $close = sub {
2796 $dialog->destroy;
2797 };
2798
2799 $dialog = new CFPlus::UI::Toplevel
2800 x => "center",
2801 y => "center",
2802 z => 3,
2803 name => 'tip_of_the_day',
2804 force_w => int $WIDTH * 4/9,
2805 force_h => int $WIDTH * 2/9,
2806 title => "Tip of the day #" . (1 + $todindex),
2807 child => my $vbox = new CFPlus::UI::VBox,
2808 has_close_button => 1,
2809 on_delete => $close,
2810 ;
2811
2812 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
2813 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2814 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
2815
2816 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
2817
2818 $table->add_at (0, 0, new CFPlus::UI::Button
2819 text => "Close",
2820 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>.",
2821 on_activate => $close,
2822 );
2823
2824 $table->add_at (2, 0, new CFPlus::UI::Button
2825 text => "Next",
2826 tooltip => "Show the next <b>Tip of the day</b>.",
2827 on_activate => sub {
2828 $close->();
2829 &show_tip_of_the_day;
2830 },
2831 );
2832
2833 $dialog->show;
2834 };
2835}
2836
2837sub sdl_init {
2838 CFPlus::SDL_Init
2839 and die "SDL::Init failed!\n";
2840}
2841
2842sub video_init {
2843 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
2844
2845 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2846
2847 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2848 $FULLSCREEN = $CFG->{fullscreen};
2849 $FAST = $CFG->{fast};
2850
2851 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2852 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
2853
2854 $SDL_ACTIVE = 1;
2855 $LAST_REFRESH = time - 0.01;
2856
2857 CFPlus::OpenGL::init;
2858
2859 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2860
2861 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2862
2863 #############################################################################
2864
2865 if ($DEBUG_STATUS) {
2866 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2867 } else {
2868 # create the widgets
2869
2870 $DEBUG_STATUS = new CFPlus::UI::Label
2871 padding => 0,
2872 z => 100,
2873 force_x => "max",
2874 force_y => 0;
2875 $DEBUG_STATUS->show;
2876
2877 $STATUSBOX = new CFPlus::UI::Statusbox;
2878 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
2879
2880 (new CFPlus::UI::Frame
2881 bg => [0, 0, 0, 0.4],
2882 force_x => 0,
2883 force_y => "max",
2884 child => $STATUSBOX,
2885 )->show;
2886
2887 CFPlus::UI::Toplevel->new (
2888 title => "Map",
2889 name => "mapmap",
2890 x => 0,
2891 y => $FONTSIZE + 8,
2892 border_bg => [1, 1, 1, 192/255],
2893 bg => [1, 1, 1, 0],
2894 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
2895 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2896 ),
2897 )->show;
2898
2899 $MAPWIDGET = new CFPlus::MapWidget;
2900 $MAPWIDGET->connect (activate_console => sub {
2901 my ($mapwidget, $preset) = @_;
2902
2903 if ($CONSOLE) {
2904 $CONSOLE->{input}->{auto_activated} = 1;
2905 $CONSOLE->{input}->grab_focus;
2906
2907 if ($preset && $CONSOLE->{input}->get_text eq '') {
2908 $CONSOLE->{input}->set_text ($preset);
2909 }
2910 }
2911 });
2912 $MAPWIDGET->show;
2913 $MAPWIDGET->grab_focus;
2914
2915 $LOGVIEW = new CFPlus::UI::TextScroller
2916 expand => 1,
2917 font => $FONT_FIXED,
2918 fontsize => $::CFG->{log_fontsize},
2919 indent => -4,
2920 can_hover => 1,
2921 can_events => 1,
2922 max_par => $CFG->{logview_max_par},
2923 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
2924 ;
2925
2926 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2927 title => "Setup",
2928 name => "setup_dialog",
2929 x => 'center',
2930 y => 'center',
2931 z => 2,
2932 force_w => $::WIDTH * 0.6,
2933 force_h => $::HEIGHT * 0.6,
2934 has_close_button => 1,
2935 ;
2936
2937 $METASERVER = metaserver_dialog;
2938
2939 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
2940 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
2941
2942 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
2943 "Configure the server to play on, your username, password and other server-related options.");
2944 $SETUP_NOTEBOOK->add (Client => client_setup,
2945 "Configure various client-specific settings.");
2946 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
2947 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
2948 $SETUP_NOTEBOOK->add (Audio => audio_setup,
2949 "Configure the use of audio, sound effects and background music.");
2950 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
2951 "Lets you define, edit and delete key bindings."
2952 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
2953 . "with nothing set and the recording started. After doing the actions you "
2954 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
2955 . "After pressing the combo the binding will be saved automatically and the "
2956 . "binding editor closes");
2957 $SETUP_NOTEBOOK->add (Debug => debug_setup,
2958 "Some debuggin' options. Do not ask.");
2959
2960 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2961
2962 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2963 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2964
2965 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
2966 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2967
2968 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2969
2970 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
2971 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2972
2973 $BUTTONBAR->add (new CFPlus::UI::Button
2974 text => "Save Config",
2975 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2976 on_activate => sub {
2977 $::CFG->{layout} = CFPlus::UI::get_layout;
2978 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
2979 status "Configuration Saved";
2980 0
2981 },
2982 );
2983
2984 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2985 tooltip => "View Documentation");
2986
2987
2988 $BUTTONBAR->add (new CFPlus::UI::Button
2989 text => "Quit",
2990 tooltip => "Terminates the program",
2991 on_activate => sub {
2992 if ($CONN) {
2993 open_quit_dialog;
2994 } else {
2995 exit;
2996 }
2997 0
2998 },
2999 );
3000
3001 $BUTTONBAR->show;
3002 $SETUP_DIALOG->show;
3003 }
3004
3005 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
3006}
3007
3008sub setup_build_button {
3009 my ($enabled) = @_;
3010 if ($enabled) {
3011 $BUILD_BUTTON->hide if $BUILD_BUTTON;
3012 $BUILD_BUTTON ||= new CFPlus::UI::Button
3013 text => "Build",
3014 tooltip => "Opens the ingame builder",
3015 on_activate => sub {
3016 if ($CONN) {
3017 $CONN->send_ext_req (builder_player_items => sub {
3018 open_ingame_editor ($_[0]) if exists $_[0]->{items};
3019 });
3020 }
3021 0
3022 };
3023 $BUTTONBAR->add ($BUILD_BUTTON);
3024 } else {
3025 $BUILD_BUTTON->hide if $BUILD_BUTTON;
3026 }
3027}
3028
3029sub open_ingame_editor {
3030 my ($msg) = @_;
3031
3032 my $win = new CFPlus::UI::Toplevel
3033 x => 0,
3034 y => 'center',
3035 z => 4,
3036 name => 'builder_window',
3037 force_w => int $WIDTH * 1/4,
3038 force_h => int $HEIGHT * 3/4,
3039 title => "In game builder",
3040 has_close_button => 1;
3041
3042 my $r = new CFPlus::UI::ScrolledWindow (
3043 expand => 1,
3044 scroll_y => 1
3045 );
3046 $r->add (my $vb = new CFPlus::UI::VBox);
3047 $win->add ($r);
3048
3049
3050 $vb->add (
3051 new CFPlus::UI::Button
3052 text => "Disable build mode",
3053 on_activate => sub { $::IN_BUILD_MODE = undef }
3054 );
3055 $vb->add (
3056 new CFPlus::UI::Button
3057 text => "ERASE",
3058 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
3059 );
3060
3061 for my $itemarchname (
3062 sort {
3063 $msg->{items}->{$a}->{build_arch_name}
3064 cmp $msg->{items}->{$b}->{build_arch_name}
3065 } keys %{$msg->{items}}
3066 ) {
3067 my $info = $msg->{items}->{$itemarchname};
3068 $vb->add (
3069 new CFPlus::UI::Button text => $info->{build_arch_name},
3070 on_activate => sub {
3071 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
3072
3073 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
3074 build_mode_query_arch_info ();
3075 }
3076 }
3077 );
3078 }
3079
3080 $win->show;
3081}
3082
3083sub build_mode_query_arch_info {
3084 my ($iteminfo) = $::IN_BUILD_MODE;
3085 my $itemarchname = $iteminfo->{item};
3086 my $info = $iteminfo->{info};
3087
3088 my $dialog = new CFPlus::UI::Toplevel
3089 x => "center",
3090 y => "center",
3091 z => 50,
3092 force_w => int $WIDTH * 1/2,
3093 title => "Enter information for placement of '$itemarchname'",
3094 has_close_button => 1;
3095
3096 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
3097
3098 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
3099 my $row = 0;
3100 if ($info->{has_name}) {
3101 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
3102 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
3103 }
3104 if ($info->{has_text}) {
3105 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
3106 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
3107 }
3108 if ($info->{has_connection}) {
3109 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
3110 $table->add_at (1, $row++,
3111 new CFPlus::UI::Entry
3112 expand => 1,
3113 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
3114 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
3115 );
3116 }
3117
3118 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
3119 $hb->add (new CFPlus::UI::Button
3120 text => "Close",
3121 expand => 1,
3122 on_activate => sub { $dialog->hide; 0 },
3123 );
3124 $dialog->show;
3125}
3126
3127sub video_shutdown {
3128 CFPlus::OpenGL::shutdown;
3129
3130 undef $SDL_ACTIVE;
3131}
3132
3133sub audio_channel_finished {
3134 my ($channel) = @_;
3135
3136 #warn "channel $channel finished\n";#d#
3137}
3138
3139sub audio_music_set {
3140 my ($songs) = @_;
3141
3142 my @want =
3143 grep $_,
3144 map $CONN->{music_meta}{$_},
3145 @$songs;
3146
3147 if (@want) {
3148 @MUSIC_WANT = @want;
3149 &audio_music_changed ();
3150 }
3151}
3152
3153sub audio_music_start {
3154 my $path = $MUSIC_PLAYING->{path}
3155 or return;
3156
3157 CFPlus::DB::prefetch_file $path, 1024_000, sub {
3158 # music might have changed...
3159 $path eq $MUSIC_PLAYING->{path}
3160 or return &audio_music_start ();
3161
3162 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
3163
3164 my $NOW = time;
3165
3166 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
3167 my $pos = $MUSIC_PLAYING->{stop_pos};
3168 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
3169 $MUSIC_START = time - $pos;
3170 } else {
3171 $MUSIC_PLAYER->play (0);
3172 $MUSIC_START = time;
3173 }
3174
3175 delete $MUSIC_PLAYING->{stop_time};
3176 delete $MUSIC_PLAYING->{stop_pos};
3177 }
3178}
3179
3180sub audio_music_changed {
3181 return unless $CFG->{bgm_enable};
3182
3183 # default MUSIC_WANT == MUSIC_DEFAULT
3184 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
3185
3186 # if the currently playing song is acceptable, let it continue
3187 return if $MUSIC_PLAYING
3188 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
3189
3190 my $NOW = time;
3191
3192 if ($MUSIC_PLAYING) {
3193 $MUSIC_PLAYING->{stop_time} = $NOW;
3194 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
3195 CFPlus::MixMusic::fade_out 1000;
3196 } else {
3197 # sort by stop time, oldest first
3198 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
3199
3200 # if the most recently-played piece played very recently,
3201 # resume it, else choose the oldest piece for rotation.
3202 $MUSIC_PLAYING =
3203 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
3204 ? $MUSIC_WANT[-1]
3205 : $MUSIC_WANT[0];
3206
3207 audio_music_start;
3208 }
3209}
3210
3211sub audio_music_finished {
3212 $MUSIC_PLAYING = undef;
3213 undef $MUSIC_PLAYER;
3214
3215 audio_music_changed;
3216}
3217
3218sub audio_init {
3219 if ($CFG->{audio_enable}) {
3220 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
3221 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
3222
3223 unless ($SDL_MIXER) {
3224 status "Unable to open sound device: there will be no sound";
3225 return;
3226 }
3227
3228 CFPlus::Mix_AllocateChannels 8;
3229 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
3230
3231 audio_music_finished;
3232
3233 local $_;
3234 while (<$fh>) {
3235 next if /^\s*#/;
3236 next if /^\s*$/;
3237
3238 my ($file, $volume, $event) = split /\s+/, $_, 3;
3239
3240 push @SOUNDS, "$volume,$file";
3241
3242 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
3243 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
3244 $chunk->volume ($volume * 128 / 100);
3245 $chunk
3246 };
3247 }
3248 } else {
3249 status "unable to open sound config: $!";
3250 }
3251 }
3252}
3253
3254sub audio_shutdown {
3255 CFPlus::Mix_CloseAudio if $SDL_MIXER;
3256 undef $SDL_MIXER;
3257 @SOUNDS = ();
3258 %AUDIO_CHUNKS = ();
3259}
3260
3261my %animate_object;
3262my $animate_timer;
3263
3264my $fps = 9;
3265
3266my %demo;#d#
3267
3268sub force_refresh {
3269 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
3270 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
3271
3272 $CFPlus::UI::ROOT->draw;
3273
3274 $WANT_REFRESH = 0;
3275 $CAN_REFRESH = 0;
3276 $LAST_REFRESH = $NOW;
3277
3278 CFPlus::SDL_GL_SwapBuffers;
3279}
3280
3281my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
3282 $NOW = time;
3283
3284 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
3285 for CFPlus::poll_events;
3286
3287 if (%animate_object) {
3288 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
3289 ++$WANT_REFRESH;
3290 }
3291
3292 if ($WANT_REFRESH) {
3293 force_refresh;
3294 } else {
3295 $CAN_REFRESH = 1;
3296 }
3297});
3298
3299sub animation_start {
3300 my ($widget) = @_;
3301 $animate_object{$widget} = $widget;
3302}
3303
3304sub animation_stop {
3305 my ($widget) = @_;
3306 delete $animate_object{$widget};
3307}
3308
3309# check once/second for faces that need to be prefetched
3310# this should, of course, only run on demand, but
3311# SDL forces worse things on us....
3312
3313Event->timer (after => 1, interval => 0.25, cb => sub {
3314 $CONN->face_prefetch
3315 if $CONN;
3316});
3317
3318%SDL_CB = (
3319 CFPlus::SDL_QUIT => sub {
3320 exit;
3321 },
3322 CFPlus::SDL_VIDEORESIZE => sub {
3323 },
3324 CFPlus::SDL_VIDEOEXPOSE => sub {
3325 CFPlus::UI::full_refresh;
3326 },
3327 CFPlus::SDL_ACTIVEEVENT => sub {
3328# not useful, as APPACTIVE include sonly iconified state, not unmapped
3329# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
3330# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
3331# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
3332# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
3333# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
3334 },
3335 CFPlus::SDL_KEYDOWN => sub {
3336 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
3337 # alt-enter
3338 $FULLSCREEN_ENABLE->toggle;
3339 video_shutdown;
3340 video_init;
3341 } else {
3342 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
3343 }
3344 },
3345 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
3346 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
3347 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
3348 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
3349 CFPlus::SDL_USEREVENT => sub {
3350 if ($_[0]{code} == 1) {
3351 audio_channel_finished $_[0]{data1};
3352 } elsif ($_[0]{code} == 0) {
3353 audio_music_finished;
3354 }
3355 },
3356);
3357
3358#############################################################################
3359
3360$SIG{INT} = $SIG{TERM} = sub { exit };
3361
3362{
3363 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
3364 CFPlus::DB::Server::run;
3365
3366 CFPlus::UI::set_layout ($::CFG->{layout});
3367
3368 my %DEF_CFG = (
3369 sdl_mode => 0,
3370 width => 640,
3371 height => 480,
3372 fullscreen => 0,
3373 fast => 0,
3374 map_scale => 1,
3375 fow_enable => 1,
3376 fow_intensity => 0,
3377 map_smoothing => 1,
3378 gui_fontsize => 1,
3379 log_fontsize => 0.7,
3380 gauge_fontsize => 1,
3381 gauge_size => 0.35,
3382 stat_fontsize => 0.7,
3383 mapsize => 100,
3384 say_command => 'chat',
3385 audio_enable => 1,
3386 bgm_enable => 1,
3387 bgm_volume => 0.25,
3388 face_prefetch => 0,
3389 output_sync => 1,
3390 output_count => 1,
3391 output_rate => "",
3392 pickup => 0,
3393 inv_sort => "mtime",
3394 default => "profile", # default profile
3395 show_tips => 1,
3396 logview_max_par => 1000,
3397 );
3398
3399 while (my ($k, $v) = each %DEF_CFG) {
3400 $CFG->{$k} = $v unless exists $CFG->{$k};
3401 }
3402
3403 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
3404 $PROFILE = $CFG->{profile}{default};
3405
3406 # convert old bindings (only default profile matters)
3407 if (my $bindings = delete $PROFILE->{bindings}) {
3408 while (my ($mod, $syms) = each %$bindings) {
3409 while (my ($sym, $cmds) = each %$syms) {
3410 push @{ $PROFILE->{macro} }, {
3411 accelkey => [$mod*1, $sym*1],
3412 action => $cmds,
3413 };
3414 }
3415 }
3416 }
3417
3418 sdl_init;
3419
3420 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
3421 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
3422 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
3423
3424 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
3425
3426 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
3427
3428 {
3429 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
3430 DejaVuSans.ttf
3431 DejaVuSansMono.ttf
3432 DejaVuSans-Bold.ttf
3433 DejaVuSansMono-Bold.ttf
3434 DejaVuSans-Oblique.ttf
3435 DejaVuSansMono-Oblique.ttf
3436 DejaVuSans-BoldOblique.ttf
3437 DejaVuSansMono-BoldOblique.ttf
3438 );
3439
3440 CFPlus::add_font $_ for @fonts;
3441
3442 CFPlus::pango_init;
3443
3444 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
3445 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
3446
3447 $FONT_PROP->make_default;
3448 }
3449
3450# compare mono (ft) vs. rgba (cairo)
3451# ft - 1.8s, cairo 3s, even in alpha-only mode
3452# for my $rgba (0..1) {
3453# my $t1 = Time::HiRes::time;
3454# for (1..1000) {
3455# my $layout = CFPlus::Layout->new ($rgba);
3456# $layout->set_text ("hallo" x 100);
3457# $layout->render;
3458# }
3459# my $t2 = Time::HiRes::time;
3460# warn $t2-$t1;
3461# }
3462
3463 $startup_done->();
3464
3465 video_init;
3466 audio_init;
3467}
3468
3469show_tip_of_the_day if $CFG->{show_tips};
3470
3471Event::loop;
3472#CFPlus::SDL_Quit;
3473#CFPlus::_exit 0;
3474
3475END {
3476 CFPlus::SDL_Quit;
3477 CFPlus::DB::Server::stop;
3478}
3479
3480=head1 NAME
3481
3482cfplus - A Crossfire+ and Crossfire game client
3483
3484=head1 SYNOPSIS
3485
3486Just run it - no commandline arguments are supported.
3487
3488=head1 USAGE
3489
3490cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
3491fullscreen and interactively.
3492
3493=head1 DEBUGGING
3494
3495
3496CFPLUS_DEBUG - environment variable
3497
3498 1 draw borders around widgets
3499 2 add low-level widget info to tooltips
3500 4 show fps
3501 8 suppress tooltips
3502
3503=head1 AUTHOR
3504
3505Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
3506
3507
3508
3509 : $self->{vslider}->hide;
3510 }
3511}
3512
995sub update { 3513sub update {
996 my ($self) = @_; 3514 my ($self) = @_;
997 3515
998 $self->SUPER::update; 3516 $self->SUPER::update;
3517 $self->update_slider;
3518}
999 3519
1000 # todo: overwrite size_allocate of child 3520sub invoke_mouse_wheel {
1001 my $child = $self->{vp}->child; 3521 my ($self, $ev) = @_;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 3522
3523 return 0 unless $ev->{dy}; # only vertical movements for now
3524
3525 $self->{vslider}->emit (mouse_wheel => $ev);
3526
3527 1
3528}
3529
3530sub invoke_button_down {
3531 my ($self, $ev, $x, $y) = @_;
3532
3533 if ($ev->{button} == 2) {
3534 $self->grab_focus;
3535
3536 my $ox = $self->{vp}{view_x} + $ev->{x};
3537 my $oy = $self->{vp}{view_y} + $ev->{y};
3538
3539 $self->{motion} = sub {
3540 my ($ev, $x, $y) = @_;
3541
3542 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
3543 $self->update;
3544 };
3545
3546 return 1;
3547 }
3548
3549 0
3550}
3551
3552sub invoke_button_up {
3553 my ($self, $ev, $x, $y) = @_;
3554
3555 if (delete $self->{motion}) {
3556 return 1;
3557 }
3558
3559 0
3560}
3561
3562sub invoke_mouse_motion {
3563 my ($self, $ev, $x, $y) = @_;
3564
3565 if ($self->{motion}) {
3566 $self->{motion}->($ev, $x, $y);
3567 return 1;
3568 }
3569
3570 0
1003} 3571}
1004 3572
1005sub invoke_size_allocate { 3573sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 3574 my ($self, $w, $h) = @_;
1007 3575
1008 my $child = $self->{vp}->child; 3576 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h) 3577 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 3578}
1013 3579
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 3580#############################################################################
1018 3581
1019package CFClient::UI::Frame; 3582package CFPlus::UI::Frame;
1020 3583
1021our @ISA = CFClient::UI::Bin::; 3584our @ISA = CFPlus::UI::Bin::;
1022 3585
1023use CFClient::OpenGL; 3586use CFPlus::OpenGL;
1024 3587
1025sub new { 3588sub new {
1026 my $class = shift; 3589 my $class = shift;
1027 3590
1028 $class->SUPER::new ( 3591 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 3617 $self->SUPER::_draw;
1055} 3618}
1056 3619
1057############################################################################# 3620#############################################################################
1058 3621
1059package CFClient::UI::FancyFrame; 3622package CFPlus::UI::FancyFrame;
1060 3623
1061our @ISA = CFClient::UI::Bin::; 3624our @ISA = CFPlus::UI::Bin::;
1062 3625
1063use CFClient::OpenGL; 3626use CFPlus::OpenGL;
3627
3628sub new {
3629 my ($class, %arg) = @_;
3630
3631 if ((exists $arg{label}) && !ref $arg{label}) {
3632 $arg{label} = new CFPlus::UI::Label
3633 align => 1,
3634 valign => 0,
3635 text => $arg{label},
3636 fontsize => ($arg{border} || 0.8) * 0.75;
3637 }
3638
3639 my $self = $class->SUPER::new (
3640 # label => "",
3641 fg => [0.6, 0.3, 0.1],
3642 border => 0.8,
3643 style => 'single',
3644 %arg,
3645 );
3646
3647 $self
3648}
3649
3650sub add {
3651 my ($self, @widgets) = @_;
3652
3653 $self->SUPER::add (@widgets);
3654 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
3655}
3656
3657sub border {
3658 int $_[0]{border} * $::FONTSIZE
3659}
3660
3661sub size_request {
3662 my ($self) = @_;
3663
3664 ($self->{label_w}, undef) = $self->{label}->size_request
3665 if $self->{label};
3666
3667 my ($w, $h) = $self->SUPER::size_request;
3668
3669 (
3670 $w + $self->border * 2,
3671 $h + $self->border * 2,
3672 )
3673}
3674
3675sub invoke_size_allocate {
3676 my ($self, $w, $h) = @_;
3677
3678 my $border = $self->border;
3679
3680 $w -= List::Util::max 0, $border * 2;
3681 $h -= List::Util::max 0, $border * 2;
3682
3683 if (my $label = $self->{label}) {
3684 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
3685 $label->{h} = List::Util::min $h, $border;
3686 $label->invoke_size_allocate ($label->{w}, $label->{h});
3687 }
3688
3689 $self->child->configure ($border, $border, $w, $h);
3690
3691 1
3692}
3693
3694sub _draw {
3695 my ($self) = @_;
3696
3697 my $child = $self->{children}[0];
3698
3699 my $border = $self->border;
3700 my ($w, $h) = ($self->{w}, $self->{h});
3701
3702 $child->draw;
3703
3704 glColor @{$self->{fg}};
3705 glBegin GL_LINE_STRIP;
3706 glVertex $border * 1.5 , $border * 0.5 + 0.5;
3707 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
3708 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
3709 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
3710 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
3711 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
3712 glEnd;
3713
3714 if ($self->{label}) {
3715 glTranslate $border * 2, 0;
3716 $self->{label}->_draw;
3717 }
3718}
3719
3720#############################################################################
3721
3722package CFPlus::UI::Toplevel;
3723
3724our @ISA = CFPlus::UI::Bin::;
3725
3726use CFPlus::OpenGL;
1064 3727
1065my $bg = 3728my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 3729 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 3730 mipmap => 1, wrap => 1;
1068 3731
1069my @border = 3732my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 3733 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 3734 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
3735
3736my @icon =
3737 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
3738 qw(x1_move.png x1_resize.png);
1072 3739
1073sub new { 3740sub new {
1074 my ($class, %arg) = @_; 3741 my ($class, %arg) = @_;
1075 3742
1076 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 3744 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 3745 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 3746 border => 0.6,
1080 can_events => 1, 3747 can_events => 1,
1081 min_w => 16, 3748 min_w => 64,
1082 min_h => 16, 3749 min_h => 32,
1083 %arg, 3750 %arg,
1084 ); 3751 );
1085 3752
1086 $self->{title_widget} = new CFClient::UI::Label 3753 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 3754 align => 0,
1088 valign => 1, 3755 valign => 1,
1089 text => $self->{title}, 3756 text => $self->{title},
1090 fontsize => $self->{border}, 3757 fontsize => $self->{border},
1091 if exists $self->{title}; 3758 if exists $self->{title};
1092 3759
1093 if ($self->{has_close_button}) { 3760 if ($self->{has_close_button}) {
1094 $self->{close_button} = 3761 $self->{close_button} =
1095 new CFClient::UI::ImageButton 3762 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 3763 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 3764 on_activate => sub { $self->emit ("delete") };
1098 3765
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 3766 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 3767 }
1101 3768
1102 $self 3769 $self
1103} 3770}
1104 3771
1105sub add { 3772sub add {
1106 my ($self, @widgets) = @_; 3773 my ($self, @widgets) = @_;
1107 3774
1108 $self->SUPER::add (@widgets); 3775 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 3776 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 3777 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 3778}
1112 3779
1113sub border { 3780sub border {
1114 int $_[0]{border} * $::FONTSIZE 3781 int $_[0]{border} * $::FONTSIZE
1115} 3782}
… …
1148 $self->child->configure ($border, $border, $w, $h); 3815 $self->child->configure ($border, $border, $w, $h);
1149 3816
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 3817 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 3818 if $self->{close_button};
1152 3819
3820 1
3821}
3822
3823sub invoke_delete {
3824 my ($self) = @_;
3825
3826 $self->hide;
3827
1153 1 3828 1
1154} 3829}
1155 3830
1156sub invoke_button_down { 3831sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 3832 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 3890 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 3891
1217 ! ! $self->{motion} 3892 ! ! $self->{motion}
1218} 3893}
1219 3894
3895sub invoke_visibility_change {
3896 my ($self, $visible) = @_;
3897
3898 delete $self->{motion} unless $visible;
3899
3900 0
3901}
3902
1220sub _draw { 3903sub _draw {
1221 my ($self) = @_; 3904 my ($self) = @_;
1222 3905
1223 my $child = $self->{children}[0]; 3906 my $child = $self->{children}[0];
1224 3907
… …
1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 3912 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230 3913
1231 my $border = $self->border; 3914 my $border = $self->border;
1232 3915
1233 glColor @{ $self->{border_bg} }; 3916 glColor @{ $self->{border_bg} };
1234 $border[0]->draw_quad_alpha (0, 0, $w, $border); 3917 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 3918 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 3919 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 3920 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
3921
3922 # move
3923 my $w2 = ($w - $border) * .5;
3924 my $h2 = ($h - $border) * .5;
3925 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
3926 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
3927 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
3928
3929 # resize
3930 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
3931 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
3932 unless $self->{has_close_button};
3933 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
3934 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238 3935
1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 3936 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240 glColor @{ $self->{bg} }; 3937 glColor @{ $self->{bg} };
1241 3938
1242 # TODO: repeat texture not scale 3939 # TODO: repeat texture not scale
… …
1261 if $self->{close_button}; 3958 if $self->{close_button};
1262} 3959}
1263 3960
1264############################################################################# 3961#############################################################################
1265 3962
1266package CFClient::UI::Table; 3963package CFPlus::UI::Table;
1267 3964
1268our @ISA = CFClient::UI::Base::; 3965our @ISA = CFPlus::UI::Base::;
1269 3966
1270use List::Util qw(max sum); 3967use List::Util qw(max sum);
1271 3968
1272use CFClient::OpenGL; 3969use CFPlus::OpenGL;
1273 3970
1274sub new { 3971sub new {
1275 my $class = shift; 3972 my $class = shift;
1276 3973
1277 $class->SUPER::new ( 3974 $class->SUPER::new (
3975 children => [],
1278 col_expand => [], 3976 col_expand => [],
3977 row_expand => [],
1279 @_, 3978 @_,
1280 ) 3979 )
1281} 3980}
1282 3981
1283sub children { 3982sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 3983 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 3984}
1286 3985
3986# TODO: store row/col info in child widget and use standard add/del
1287sub add { 3987sub add {
1288 my ($self, $x, $y, $child) = @_; 3988 my $self = shift;
1289 3989
3990 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
3991 $self->add_at (@_);
3992}
3993
3994sub add_at {
3995 my $self = shift;
3996
3997 while (@_) {
3998 my ($col, $row, $child) = splice @_, 0, 3, ();
3999
1290 $child->set_parent ($self); 4000 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 4001 $self->{children}[$row][$col] = $child;
4002 }
1292 4003
4004 $self->{force_realloc} = 1;
4005 $self->{force_size_alloc} = 1;
1293 $self->realloc; 4006 $self->realloc;
1294} 4007}
1295 4008
1296sub remove { 4009sub remove {
1297 my ($self, $child) = @_; 4010 my ($self, $child) = @_;
1298 4011
1299 # TODO: not yet implemented 4012 for (@{ $self->{children} }) {
4013 for (@{ $_ || [] }) {
4014 $_ = undef if $_ == $child;
4015 }
4016 }
1300} 4017}
1301 4018
1302# TODO: move to container class maybe? send children a signal on removal? 4019# TODO: move to container class maybe? send children a signal on removal?
1303sub clear { 4020sub clear {
1304 my ($self) = @_; 4021 my ($self) = @_;
… …
1353 my ($ws, $hs) = $self->get_wh; 4070 my ($ws, $hs) = $self->get_wh;
1354 4071
1355 my $req_w = (sum @$ws) || 1; 4072 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 4073 my $req_h = (sum @$hs) || 1;
1357 4074
1358 # TODO: nicer code && do row_expand 4075 # TODO: nicer code
1359 my @col_expand = @{$self->{col_expand}}; 4076 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 4077 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 4078 my $col_expand = (sum @col_expand) || 1;
1362 4079
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 4080 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 4081
1367 CFClient::UI::harmonize $ws; 4082 CFPlus::UI::harmonize $ws;
4083
4084 my @row_expand = @{$self->{row_expand}};
4085 @row_expand = (1) x @$ws unless @row_expand;
4086 my $row_expand = (sum @row_expand) || 1;
4087
4088 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
4089
1368 CFClient::UI::harmonize $hs; 4090 CFPlus::UI::harmonize $hs;
1369 4091
1370 my $y; 4092 my $y;
1371 4093
1372 for my $r (0 .. $#{$self->{children}}) { 4094 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 4095 my $row = $self->{children}[$r]
… …
1416 } 4138 }
1417} 4139}
1418 4140
1419############################################################################# 4141#############################################################################
1420 4142
1421package CFClient::UI::Box; 4143package CFPlus::UI::Fixed;
1422 4144
4145use List::Util qw(min max);
4146
1423our @ISA = CFClient::UI::Container::; 4147our @ISA = CFPlus::UI::Container::;
4148
4149sub add {
4150 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
4151
4152 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
4153 $self->SUPER::add ($child);
4154}
4155
4156sub _scale($$$) {
4157 my ($mode, $val, $max) = @_;
4158
4159 $mode eq "abs" ? $val
4160 : $mode eq "rel" ? $val * $max
4161 : 0
4162}
4163
4164sub size_request {
4165 my ($self) = @_;
4166
4167 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
4168
4169 # determine overall size by querying abs widgets
4170 for my $child ($self->visible_children) {
4171 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
4172
4173 if ($pos eq "abs") {
4174 $w = _scale $size, $w, $child->{req_w};
4175 $h = _scale $size, $h, $child->{req_h};
4176
4177 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
4178 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
4179 }
4180 }
4181
4182 my $W = $x2 - $x1;
4183 my $H = $y2 - $y1;
4184
4185 # now layout remaining widgets
4186 for my $child ($self->visible_children) {
4187 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
4188
4189 if ($pos ne "abs") {
4190 $x = _scale $pos, $x, $W;
4191 $y = _scale $pos, $x, $H;
4192 $w = _scale $size, $w, $child->{req_w};
4193 $h = _scale $size, $h, $child->{req_h};
4194
4195 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
4196 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
4197 }
4198 }
4199
4200 my $W = $x2 - $x1;
4201 my $H = $y2 - $y1;
4202
4203 ($W, $H)
4204}
4205
4206sub invoke_size_allocate {
4207 my ($self, $W, $H) = @_;
4208
4209 for my $child ($self->visible_children) {
4210 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
4211
4212 $x = _scale $pos, $x, $W;
4213 $y = _scale $pos, $x, $H;
4214 $w = _scale $size, $w, $child->{req_w};
4215 $h = _scale $size, $h, $child->{req_h};
4216
4217 $child->configure ($x, $y, $w, $h);
4218 }
4219
4220 1
4221}
4222
4223#############################################################################
4224
4225package CFPlus::UI::Box;
4226
4227our @ISA = CFPlus::UI::Container::;
1424 4228
1425sub size_request { 4229sub size_request {
1426 my ($self) = @_; 4230 my ($self) = @_;
1427 4231
1428 $self->{vertical} 4232 $self->{vertical}
… …
1438 4242
1439sub invoke_size_allocate { 4243sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 4244 my ($self, $w, $h) = @_;
1441 4245
1442 my $space = $self->{vertical} ? $h : $w; 4246 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 4247 my @children = $self->visible_children;
1444 4248
1445 my @req; 4249 my @req;
1446 4250
1447 if ($self->{homogeneous}) { 4251 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 4252 @req = ($space / (@children || 1)) x @children;
1449 } else { 4253 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 4254 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 4255 my $req = List::Util::sum @req;
1452 4256
1453 if ($req > $space) { 4257 if ($req > $space) {
1454 # ah well, not enough space 4258 # ah well, not enough space
1455 $_ *= $space / $req for @req; 4259 $_ *= $space / $req for @req;
1456 } else { 4260 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 4261 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 4262
1459 $space = ($space - $req) / $expand; # remaining space to give away 4263 $space = ($space - $req) / $expand; # remaining space to give away
1460 4264
1461 $req[$_] += $space * $children->[$_]{expand} 4265 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 4266 for 0 .. $#children;
1463 } 4267 }
1464 } 4268 }
1465 4269
1466 CFClient::UI::harmonize \@req; 4270 CFPlus::UI::harmonize \@req;
1467 4271
1468 my $pos = 0; 4272 my $pos = 0;
1469 for (0 .. $#$children) { 4273 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 4274 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 4275 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 4276
1473 $pos += $alloc; 4277 $pos += $alloc;
1474 } 4278 }
1475 4279
1476 1 4280 1
1477} 4281}
1478 4282
1479############################################################################# 4283#############################################################################
1480 4284
1481package CFClient::UI::HBox; 4285package CFPlus::UI::HBox;
1482 4286
1483our @ISA = CFClient::UI::Box::; 4287our @ISA = CFPlus::UI::Box::;
1484 4288
1485sub new { 4289sub new {
1486 my $class = shift; 4290 my $class = shift;
1487 4291
1488 $class->SUPER::new ( 4292 $class->SUPER::new (
… …
1491 ) 4295 )
1492} 4296}
1493 4297
1494############################################################################# 4298#############################################################################
1495 4299
1496package CFClient::UI::VBox; 4300package CFPlus::UI::VBox;
1497 4301
1498our @ISA = CFClient::UI::Box::; 4302our @ISA = CFPlus::UI::Box::;
1499 4303
1500sub new { 4304sub new {
1501 my $class = shift; 4305 my $class = shift;
1502 4306
1503 $class->SUPER::new ( 4307 $class->SUPER::new (
… …
1506 ) 4310 )
1507} 4311}
1508 4312
1509############################################################################# 4313#############################################################################
1510 4314
1511package CFClient::UI::Label; 4315package CFPlus::UI::Label;
1512 4316
1513our @ISA = CFClient::UI::DrawBG::; 4317our @ISA = CFPlus::UI::DrawBG::;
1514 4318
1515use CFClient::OpenGL; 4319use CFPlus::OpenGL;
1516 4320
1517sub new { 4321sub new {
1518 my ($class, %arg) = @_; 4322 my ($class, %arg) = @_;
1519 4323
1520 my $self = $class->SUPER::new ( 4324 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 4327 #active_bg => none
1524 #font => default_font 4328 #font => default_font
1525 #text => initial text 4329 #text => initial text
1526 #markup => initial narkup 4330 #markup => initial narkup
1527 #max_w => maximum pixel width 4331 #max_w => maximum pixel width
4332 #style => 0, # render flags
1528 ellipsise => 3, # end 4333 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 4334 layout => (new CFPlus::Layout),
1530 fontsize => 1, 4335 fontsize => 1,
1531 align => -1, 4336 align => -1,
1532 valign => -1, 4337 valign => -1,
1533 padding_x => 2, 4338 padding_x => 2,
1534 padding_y => 2, 4339 padding_y => 2,
1535 can_events => 0, 4340 can_events => 0,
1536 %arg 4341 %arg
1537 ); 4342 );
1538 4343
1539 if (exists $self->{template}) { 4344 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 4345 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 4346 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 4347 $self->{template} = $layout;
1543 } 4348 }
1544 4349
1545 if (exists $self->{markup}) { 4350 if (exists $self->{markup}) {
… …
1549 } 4354 }
1550 4355
1551 $self 4356 $self
1552} 4357}
1553 4358
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 4359sub update {
1565 my ($self) = @_; 4360 my ($self) = @_;
1566 4361
1567 delete $self->{texture}; 4362 delete $self->{texture};
1568 $self->SUPER::update; 4363 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 4374 my ($self, $text) = @_;
1580 4375
1581 return if $self->{text} eq "T$text"; 4376 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 4377 $self->{text} = "T$text";
1583 4378
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 4379 $self->{layout}->set_text ($text);
1586 4380
1587 delete $self->{size_req}; 4381 delete $self->{size_req};
1588 $self->realloc; 4382 $self->realloc;
1589 $self->update; 4383 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 4389 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 4390 $self->{text} = "M$markup";
1597 4391
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 4392 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 4393
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 4394 $self->{layout}->set_markup ($markup);
1602 4395
1603 delete $self->{size_req}; 4396 delete $self->{size_req};
1604 $self->realloc; 4397 $self->realloc;
1605 $self->update; 4398 $self->update;
… …
1617 4410
1618 my ($w, $h) = $self->{layout}->size; 4411 my ($w, $h) = $self->{layout}->size;
1619 4412
1620 if (exists $self->{template}) { 4413 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 4414 $self->{template}->set_font ($self->{font}) if $self->{font};
4415 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 4416 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 4417
1624 my ($w2, $h2) = $self->{template}->size; 4418 my ($w2, $h2) = $self->{template}->size;
1625 4419
1626 $w = List::Util::max $w, $w2; 4420 $w = List::Util::max $w, $w2;
… …
1631 }; 4425 };
1632 4426
1633 @{ $self->{size_req} } 4427 @{ $self->{size_req} }
1634} 4428}
1635 4429
4430sub baseline_shift {
4431 $_[0]{layout}->descent
4432}
4433
1636sub invoke_size_allocate { 4434sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 4435 my ($self, $w, $h) = @_;
1638 4436
1639 delete $self->{ox}; 4437 delete $self->{ox};
1640 4438
… …
1646 4444
1647sub set_fontsize { 4445sub set_fontsize {
1648 my ($self, $fontsize) = @_; 4446 my ($self, $fontsize) = @_;
1649 4447
1650 $self->{fontsize} = $fontsize; 4448 $self->{fontsize} = $fontsize;
4449 delete $self->{size_req};
1651 delete $self->{texture}; 4450 delete $self->{texture};
1652 4451
1653 $self->realloc; 4452 $self->realloc;
1654} 4453}
1655 4454
1656sub reconfigure { 4455sub reconfigure {
1657 my ($self) = @_; 4456 my ($self) = @_;
1658 4457
1659 delete $self->{size_req}; 4458 delete $self->{size_req};
4459 delete $self->{texture};
1660 4460
1661 $self->SUPER::reconfigure; 4461 $self->SUPER::reconfigure;
1662} 4462}
1663 4463
1664sub _draw { 4464sub _draw {
1665 my ($self) = @_; 4465 my ($self) = @_;
1666 4466
1667 $self->SUPER::_draw; # draw background, if applicable 4467 $self->SUPER::_draw; # draw background, if applicable
1668 4468
1669 my $tex = $self->{texture} ||= do { 4469 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 4470 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 4471 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 4472 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 4473 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 4474 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 4475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 4476
1677 new_from_layout CFClient::Texture $self->{layout} 4477 [$self->{layout}->size]
1678 }; 4478 };
1679 4479
1680 unless (exists $self->{ox}) { 4480 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 4481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 4482 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 4483 : ($self->{w} - $size->[0]) * 0.5);
1684 4484
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 4485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 4486 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 4487 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 4488 };
1689 4489
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 4490 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 4491 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 4492
1695 if ($tex->{format} == GL_ALPHA) { 4493 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 4494}
1706 4495
1707############################################################################# 4496#############################################################################
1708 4497
1709package CFClient::UI::EntryBase; 4498package CFPlus::UI::EntryBase;
1710 4499
1711our @ISA = CFClient::UI::Label::; 4500our @ISA = CFPlus::UI::Label::;
1712 4501
1713use CFClient::OpenGL; 4502use CFPlus::OpenGL;
1714 4503
1715sub new { 4504sub new {
1716 my $class = shift; 4505 my $class = shift;
1717 4506
1718 $class->SUPER::new ( 4507 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 4511 active_fg => [0, 0, 0],
1723 can_hover => 1, 4512 can_hover => 1,
1724 can_focus => 1, 4513 can_focus => 1,
1725 valign => 0, 4514 valign => 0,
1726 can_events => 1, 4515 can_events => 1,
4516 ellipsise => 0,
1727 #text => ... 4517 #text => ...
1728 #hidden => "*", 4518 #hidden => "*",
1729 @_ 4519 @_
1730 ) 4520 )
1731} 4521}
… …
1776 my $sym = $ev->{sym}; 4566 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 4567 my $uni = $ev->{unicode};
1778 4568
1779 my $text = $self->get_text; 4569 my $text = $self->get_text;
1780 4570
4571 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
4572
1781 if ($uni == 8) { 4573 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 4574 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 4575 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 4576 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 4577 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 4578 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 4579 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 4580 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 4581 } elsif ($sym == CFPlus::SDLK_HOME) {
4582 # what a hack
4583 $self->{cursor} =
4584 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
4585 ? length $1
4586 : 0;
4587 } elsif ($sym == CFPlus::SDLK_END) {
4588 # uh, again
4589 $self->{cursor} =
4590 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
4591 ? $self->{cursor} + length $1
4592 : length $self->{text};
4593 } elsif ($uni == 21) { # ctrl-u
4594 $text = "";
1790 $self->{cursor} = 0; 4595 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 4596 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 4597 $self->emit ('escape');
1795 } elsif ($uni) { 4598 } elsif ($uni == 0x0d) {
4599 substr $text, $self->{cursor}++, 0, "\012";
4600 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 4601 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 4602 } else {
1798 return 0; 4603 return 0;
1799 } 4604 }
1800 4605
1801 $self->_set_text ($text); 4606 $self->_set_text ($text);
1802 4607
1803 $self->realloc; 4608 $self->realloc;
4609 $self->update;
1804 4610
1805 1 4611 1
1806} 4612}
1807 4613
1808sub invoke_focus_in { 4614sub invoke_focus_in {
… …
1820 4626
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 4627 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 4628
1823 # byte-index to char-index 4629 # byte-index to char-index
1824 my $text = $self->{text}; 4630 my $text = $self->{text};
1825 utf8::encode $text; 4631 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 4632 $self->{cursor} = length $text;
1827 4633
1828 $self->_set_text ($self->{text}); 4634 $self->_set_text ($self->{text});
1829 $self->update; 4635 $self->update;
1830 4636
1831 1 4637 1
… …
1870 utf8::encode $text; 4676 utf8::encode $text;
1871 4677
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 4678 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 4679 }
1874 4680
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 4681 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 4682 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 4683 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 4684 glEnd;
1880 } 4685 }
1881} 4686}
1882 4687
4688#############################################################################
4689
1883package CFClient::UI::Entry; 4690package CFPlus::UI::Entry;
1884 4691
1885our @ISA = CFClient::UI::EntryBase::; 4692our @ISA = CFPlus::UI::EntryBase::;
1886 4693
1887use CFClient::OpenGL; 4694use CFPlus::OpenGL;
1888 4695
1889sub invoke_key_down { 4696sub invoke_key_down {
1890 my ($self, $ev) = @_; 4697 my ($self, $ev) = @_;
1891 4698
1892 my $sym = $ev->{sym}; 4699 my $sym = $ev->{sym};
1893 4700
1894 if ($sym == 13) { 4701 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 4702 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 4703 my $txt = $self->get_text;
1897 4704
1898 $self->{history_pointer} = -1; 4705 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 4706 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 4707 $self->emit (activate => $txt);
1901 $self->update; 4708 $self->update;
1902 4709
1903 } elsif ($sym == CFClient::SDLK_UP) { 4710 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 4711 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 4712 $self->{history_saveback} = $self->get_text;
1906 } 4713 }
1907 if (@{$self->{history} || []} > 0) { 4714 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 4715 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 4717 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 4718 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 4719 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 4720 }
1914 4721
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 4722 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 4723 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 4724 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 4725
1919 if ($self->{history_pointer} >= 0) { 4726 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 4727 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 4736 1
1930} 4737}
1931 4738
1932############################################################################# 4739#############################################################################
1933 4740
4741package CFPlus::UI::TextEdit;
4742
4743our @ISA = CFPlus::UI::EntryBase::;
4744
4745use CFPlus::OpenGL;
4746
4747sub move_cursor_ver {
4748 my ($self, $dy) = @_;
4749
4750 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
4751
4752 $y += $dy;
4753
4754 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
4755 $self->{cursor} = $index;
4756 delete $self->{cur_h};
4757 $self->update;
4758 return;
4759 }
4760}
4761
4762sub invoke_key_down {
4763 my ($self, $ev) = @_;
4764
4765 my $sym = $ev->{sym};
4766
4767 if ($sym == CFPlus::SDLK_UP) {
4768 $self->move_cursor_ver (-1);
4769 } elsif ($sym == CFPlus::SDLK_DOWN) {
4770 $self->move_cursor_ver (+1);
4771 } else {
4772 return $self->SUPER::invoke_key_down ($ev)
4773 }
4774
4775 1
4776}
4777
4778#############################################################################
4779
1934package CFClient::UI::Button; 4780package CFPlus::UI::Button;
1935 4781
1936our @ISA = CFClient::UI::Label::; 4782our @ISA = CFPlus::UI::Label::;
1937 4783
1938use CFClient::OpenGL; 4784use CFPlus::OpenGL;
1939 4785
1940my @tex = 4786my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 4787 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 4788 qw(b1_button_inactive.png b1_button_active.png);
1943 4789
1944sub new { 4790sub new {
1945 my $class = shift; 4791 my $class = shift;
1946 4792
1947 $class->SUPER::new ( 4793 $class->SUPER::new (
1948 padding_x => 4, 4794 padding_x => 4,
1949 padding_y => 4, 4795 padding_y => 4,
1950 fg => [1, 1, 1], 4796 fg => [1.0, 1.0, 1.0],
1951 active_fg => [0, 0, 1], 4797 active_fg => [0.8, 0.8, 0.8],
1952 can_hover => 1, 4798 can_hover => 1,
1953 align => 0, 4799 align => 0,
1954 valign => 0, 4800 valign => 0,
1955 can_events => 1, 4801 can_events => 1,
1956 @_ 4802 @_
… …
1974 4820
1975 glEnable GL_TEXTURE_2D; 4821 glEnable GL_TEXTURE_2D;
1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 4822 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977 glColor 0, 0, 0, 1; 4823 glColor 0, 0, 0, 1;
1978 4824
4825 my $tex = $tex[$GRAB == $self];
1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 4826 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980 4827
1981 glDisable GL_TEXTURE_2D; 4828 glDisable GL_TEXTURE_2D;
1982 4829
1983 $self->SUPER::_draw; 4830 $self->SUPER::_draw;
1984} 4831}
1985 4832
1986############################################################################# 4833#############################################################################
1987 4834
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
2024package CFClient::UI::CheckBox; 4835package CFPlus::UI::CheckBox;
2025 4836
2026our @ISA = CFClient::UI::DrawBG::; 4837our @ISA = CFPlus::UI::DrawBG::;
2027 4838
2028my @tex = 4839my @tex =
2029 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 4840 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2030 qw(c1_checkbox_bg.png c1_checkbox_active.png); 4841 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031 4842
2032use CFClient::OpenGL; 4843use CFPlus::OpenGL;
2033 4844
2034sub new { 4845sub new {
2035 my $class = shift; 4846 my $class = shift;
2036 4847
2037 $class->SUPER::new ( 4848 $class->SUPER::new (
… …
2051 my ($self) = @_; 4862 my ($self) = @_;
2052 4863
2053 (6) x 2 4864 (6) x 2
2054} 4865}
2055 4866
4867sub toggle {
4868 my ($self) = @_;
4869
4870 $self->{state} = !$self->{state};
4871 $self->emit (changed => $self->{state});
4872 $self->update;
4873}
4874
2056sub invoke_button_down { 4875sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 4876 my ($self, $ev, $x, $y) = @_;
2058 4877
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 4878 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 4879 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 4880 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 4881 } else {
2064 return 0 4882 return 0
2065 } 4883 }
2066 4884
2067 1 4885 1
… …
2087 glDisable GL_TEXTURE_2D; 4905 glDisable GL_TEXTURE_2D;
2088} 4906}
2089 4907
2090############################################################################# 4908#############################################################################
2091 4909
2092package CFClient::UI::Image; 4910package CFPlus::UI::Image;
2093 4911
2094our @ISA = CFClient::UI::Base::; 4912our @ISA = CFPlus::UI::Base::;
2095 4913
2096use CFClient::OpenGL; 4914use CFPlus::OpenGL;
2097use Carp qw/confess/;
2098 4915
2099our %loaded_images; 4916our %texture_cache;
2100 4917
2101sub new { 4918sub new {
2102 my $class = shift; 4919 my $class = shift;
2103 4920
2104 my $self = $class->SUPER::new (can_events => 0, @_); 4921 my $self = $class->SUPER::new (
4922 can_events => 0,
4923 @_,
4924 );
2105 4925
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 4926 $self->{path} || $self->{tex}
4927 or Carp::croak "'path' or 'tex' attributes required";
2107 4928
2108 $loaded_images{$self->{image}} ||= 4929 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 4930 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2110 4931
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 4932 CFPlus::weaken $texture_cache{$self->{path}};
2112 4933
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 4934 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 4935
2117 $self 4936 $self
2118} 4937}
2119 4938
4939sub STORABLE_freeze {
4940 my ($self, $cloning) = @_;
4941
4942 $self->{path}
4943 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
4944
4945 $self->{path}
4946}
4947
4948sub STORABLE_attach {
4949 my ($self, $cloning, $path) = @_;
4950
4951 $self->new (path => $path)
4952}
4953
2120sub size_request { 4954sub size_request {
2121 my ($self) = @_; 4955 my ($self) = @_;
2122 4956
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 4957 ($self->{tex}{w}, $self->{tex}{h})
2124} 4958}
2125 4959
2126sub _draw { 4960sub _draw {
2127 my ($self) = @_; 4961 my ($self) = @_;
2128 4962
… …
2138 } 4972 }
2139 4973
2140 glEnable GL_TEXTURE_2D; 4974 glEnable GL_TEXTURE_2D;
2141 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 4975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142 4976
2143 $tex->draw_quad_alpha (0, 0, $w, $h); 4977 $tex->draw_quad (0, 0, $w, $h);
2144 4978
2145 glDisable GL_TEXTURE_2D; 4979 glDisable GL_TEXTURE_2D;
2146} 4980}
2147 4981
2148############################################################################# 4982#############################################################################
2149 4983
4984package CFPlus::UI::ImageButton;
4985
4986our @ISA = CFPlus::UI::Image::;
4987
4988use CFPlus::OpenGL;
4989
4990my %textures;
4991
4992sub new {
4993 my $class = shift;
4994
4995 my $self = $class->SUPER::new (
4996 padding_x => 4,
4997 padding_y => 4,
4998 fg => [1, 1, 1],
4999 active_fg => [0, 0, 1],
5000 can_hover => 1,
5001 align => 0,
5002 valign => 0,
5003 can_events => 1,
5004 @_
5005 );
5006}
5007
5008sub invoke_button_up {
5009 my ($self, $ev, $x, $y) = @_;
5010
5011 $self->emit ("activate")
5012 if $x >= 0 && $x < $self->{w}
5013 && $y >= 0 && $y < $self->{h};
5014
5015 1
5016}
5017
5018#############################################################################
5019
2150package CFClient::UI::VGauge; 5020package CFPlus::UI::VGauge;
2151 5021
2152our @ISA = CFClient::UI::Base::; 5022our @ISA = CFPlus::UI::Base::;
2153 5023
2154use List::Util qw(min max); 5024use List::Util qw(min max);
2155 5025
2156use CFClient::OpenGL; 5026use CFPlus::OpenGL;
2157 5027
2158my %tex = ( 5028my %tex = (
2159 food => [ 5029 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 5030 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 5031 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 5032 ],
2163 grace => [ 5033 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 5034 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 5035 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 5036 ],
2167 hp => [ 5037 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 5038 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 5039 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 5040 ],
2171 mana => [ 5041 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 5042 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 5043 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 5044 ],
2175); 5045);
2176 5046
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 5047# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 5107 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 5108 my $ycut2 = max 0, min 1, $ycut - 1;
2239 5109
2240 my $h1 = $self->{h} * (1 - $ycut1); 5110 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 5111 my $h2 = $self->{h} * (1 - $ycut2);
5112 my $h3 = $self->{h};
5113
5114 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 5115
2243 glEnable GL_BLEND; 5116 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 5117 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 5118 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 5119 glEnable GL_TEXTURE_2D;
… …
2265 5138
2266 if ($t3) { 5139 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 5140 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 5141 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 5142 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 5143 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 5144 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 5145 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 5146 glEnd;
2274 } 5147 }
2275 5148
2276 glDisable GL_BLEND; 5149 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 5150 glDisable GL_TEXTURE_2D;
2278} 5151}
2279 5152
2280############################################################################# 5153#############################################################################
2281 5154
2282package CFClient::UI::Gauge; 5155package CFPlus::UI::Gauge;
2283 5156
2284our @ISA = CFClient::UI::VBox::; 5157our @ISA = CFPlus::UI::VBox::;
2285 5158
2286sub new { 5159sub new {
2287 my ($class, %arg) = @_; 5160 my ($class, %arg) = @_;
2288 5161
2289 my $self = $class->SUPER::new ( 5162 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 5164 can_hover => 1,
2292 can_events => 1, 5165 can_events => 1,
2293 %arg, 5166 %arg,
2294 ); 5167 );
2295 5168
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 5169 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 5170 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 5171 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 5172
2300 $self 5173 $self
2301} 5174}
2302 5175
2303sub set_fontsize { 5176sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 5197 $self->{value}->set_text ($val);
2325} 5198}
2326 5199
2327############################################################################# 5200#############################################################################
2328 5201
2329package CFClient::UI::Slider; 5202package CFPlus::UI::Slider;
2330 5203
2331use strict; 5204use strict;
2332 5205
2333use CFClient::OpenGL; 5206use CFPlus::OpenGL;
2334 5207
2335our @ISA = CFClient::UI::DrawBG::; 5208our @ISA = CFPlus::UI::DrawBG::;
2336 5209
2337my @tex = 5210my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 5211 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 5212 qw(s1_slider.png s1_slider_bg.png);
2340 5213
2341sub new { 5214sub new {
2342 my $class = shift; 5215 my $class = shift;
2343 5216
… …
2432 } 5305 }
2433 5306
2434 1 5307 1
2435} 5308}
2436 5309
5310sub invoke_mouse_wheel {
5311 my ($self, $ev) = @_;
5312
5313 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
5314
5315 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
5316
5317 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
5318
5319 ! ! $delta
5320}
5321
2437sub update { 5322sub update {
2438 my ($self) = @_; 5323 my ($self) = @_;
2439 5324
2440 delete $self->{knob_w}; 5325 delete $self->{knob_w};
2441 $self->SUPER::update; 5326 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 5373 glDisable GL_TEXTURE_2D;
2489} 5374}
2490 5375
2491############################################################################# 5376#############################################################################
2492 5377
2493package CFClient::UI::ValSlider; 5378package CFPlus::UI::ValSlider;
2494 5379
2495our @ISA = CFClient::UI::HBox::; 5380our @ISA = CFPlus::UI::HBox::;
2496 5381
2497sub new { 5382sub new {
2498 my ($class, %arg) = @_; 5383 my ($class, %arg) = @_;
2499 5384
2500 my $range = delete $arg{range}; 5385 my $range = delete $arg{range};
2501 5386
2502 my $self = $class->SUPER::new ( 5387 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 5388 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 5389 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 5390 to_value => sub { shift },
2506 from_value => sub { shift }, 5391 from_value => sub { shift },
2507 %arg, 5392 %arg,
2508 ); 5393 );
2509 5394
… …
2529sub set_range { shift->{slider}->set_range (@_) } 5414sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 5415sub set_value { shift->{slider}->set_value (@_) }
2531 5416
2532############################################################################# 5417#############################################################################
2533 5418
2534package CFClient::UI::TextScroller; 5419package CFPlus::UI::TextScroller;
2535 5420
2536our @ISA = CFClient::UI::HBox::; 5421our @ISA = CFPlus::UI::HBox::;
2537 5422
2538use CFClient::OpenGL; 5423use CFPlus::OpenGL;
2539 5424
2540sub new { 5425sub new {
2541 my $class = shift; 5426 my $class = shift;
2542 5427
2543 my $self = $class->SUPER::new ( 5428 my $self = $class->SUPER::new (
2544 fontsize => 1, 5429 fontsize => 1,
2545 can_events => 0, 5430 can_events => 1,
2546 indent => 0, 5431 indent => 0,
2547 #font => default_font 5432 #font => default_font
2548 @_, 5433 @_,
2549 5434
2550 layout => (new CFClient::Layout 1), 5435 layout => (new CFPlus::Layout),
2551 par => [], 5436 par => [],
5437 max_par => 0,
2552 height => 0, 5438 height => 0,
2553 children => [ 5439 children => [
2554 (new CFClient::UI::Empty expand => 1), 5440 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 5441 (new CFPlus::UI::Slider vertical => 1),
2556 ], 5442 ],
2557 ); 5443 );
2558 5444
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 5445 $self->{children}[1]->connect (changed => sub { $self->update });
2560 5446
… …
2566 5452
2567 $self->{fontsize} = $fontsize; 5453 $self->{fontsize} = $fontsize;
2568 $self->reflow; 5454 $self->reflow;
2569} 5455}
2570 5456
5457sub size_request {
5458 my ($self) = @_;
5459
5460 my ($empty, $slider) = @{ $self->{children} };
5461
5462 local $self->{children} = [$empty, $slider];
5463 $self->SUPER::size_request
5464}
5465
2571sub invoke_size_allocate { 5466sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 5467 my ($self, $w, $h) = @_;
2573 5468
5469 my ($empty, $slider, @other) = @{ $self->{children} };
5470 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
5471
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 5472 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 5473 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 5474 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 5475 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 5476
2579 $self->reflow; 5477 $self->reflow;
2580 5478
5479 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 5480 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 5481}
2583 5482
2584sub text_size { 5483sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 5484 my ($self, $ev) = @_;
5485
5486 return 0 unless $ev->{dy}; # only vertical movements
5487
5488 $self->{children}[1]->emit (mouse_wheel => $ev);
5489
5490 1
5491}
5492
5493sub get_layout {
5494 my ($self, $para) = @_;
2586 5495
2587 my $layout = $self->{layout}; 5496 my $layout = $self->{layout};
2588 5497
5498 $layout->set_font ($self->{font}) if $self->{font};
5499 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 5500 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 5501 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 5502 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 5503 $layout->set_markup ($para->{markup});
5504
5505 $layout->set_shapes (
5506 map
5507 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
5508 @{$para->{widget}}
2593 5509 );
5510
2594 $layout->size 5511 $layout
2595} 5512}
2596 5513
2597sub reflow { 5514sub reflow {
2598 my ($self) = @_; 5515 my ($self) = @_;
2599 5516
… …
2606 5523
2607 # todo: base offset on lines or so, not on pixels 5524 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 5525 $self->{children}[1]->set_value ($offset);
2609} 5526}
2610 5527
5528sub current_paragraph {
5529 my ($self) = @_;
5530
5531 $self->{top_paragraph} - 1
5532}
5533
5534sub scroll_to {
5535 my ($self, $para) = @_;
5536
5537 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
5538
5539 $self->{scroll_to} = $para;
5540 $self->update;
5541}
5542
2611sub clear { 5543sub clear {
2612 my ($self) = @_; 5544 my ($self) = @_;
5545
5546 my (undef, undef, @other) = @{ $self->{children} };
5547 $self->remove ($_) for @other;
2613 5548
2614 $self->{par} = []; 5549 $self->{par} = [];
2615 $self->{height} = 0; 5550 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 5551 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 5552}
2618 5553
2619sub add_paragraph { 5554sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 5555 my $self = shift;
2621 5556
2622 for my $line (split /\n/, $text) { 5557 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 5558 $para = {
5559 fg => [1, 1, 1, 1],
5560 indent => 0,
5561 markup => "",
5562 widget => [],
5563 ref $para ? %$para : (markup => $para),
5564 w => 1e10,
5565 wrapped => 1,
5566 };
5567
5568 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
5569 push @{$self->{par}}, $para;
5570 }
5571
5572 if (my $max = $self->{max_par}) {
5573 shift @{$self->{par}} while @{$self->{par}} > $max;
5574 }
5575
5576 $self->{need_reflow}++;
5577 $self->update;
5578}
5579
5580sub scroll_to_bottom {
5581 my ($self) = @_;
5582
5583 $self->{scroll_to} = $#{$self->{par}};
5584 $self->update;
5585}
5586
5587sub force_uptodate {
5588 my ($self) = @_;
5589
5590 if (delete $self->{need_reflow}) {
5591 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
5592
5593 my $height = 0;
5594
5595 for my $para (@{$self->{par}}) {
5596 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
5597 my $layout = $self->get_layout ($para);
5598 my ($w, $h) = $layout->size;
5599
5600 $para->{w} = $w + $para->{indent};
5601 $para->{h} = $h;
5602 $para->{wrapped} = $layout->has_wrapped;
5603 }
5604
5605 $para->{y} = $height;
5606 $height += $para->{h};
5607 }
5608
2624 $self->{height} += $h; 5609 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 5610 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 5611
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 5612 delete $self->{texture};
5613 }
5614
5615 if (my $paridx = delete $self->{scroll_to}) {
5616 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
5617 }
2629} 5618}
2630 5619
2631sub update { 5620sub update {
2632 my ($self) = @_; 5621 my ($self) = @_;
2633 5622
… …
2636 return unless $self->{h} > 0; 5625 return unless $self->{h} > 0;
2637 5626
2638 delete $self->{texture}; 5627 delete $self->{texture};
2639 5628
2640 $ROOT->on_post_alloc ($self => sub { 5629 $ROOT->on_post_alloc ($self => sub {
5630 $self->force_uptodate;
5631
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 5632 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 5633
2643 if (delete $self->{need_reflow}) {
2644 my $height = 0;
2645
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3];
2657 $_->[1] = $h;
2658 }
2659
2660 $height += $_->[1];
2661 }
2662
2663 $self->{height} = $height;
2664
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667 delete $self->{texture};
2668 }
2669
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 5634 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 5635 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 5636 glClear GL_COLOR_BUFFER_BIT;
2673 5637
5638 package CFPlus::UI::Base;
5639 local ($draw_x, $draw_y, $draw_w, $draw_h) =
5640 (0, 0, $self->{w}, $self->{h});
5641
5642 my $top = int $self->{children}[1]{range}[0];
5643
5644 my $paridx = 0;
5645 my $top_paragraph;
2674 my $top = int $self->{children}[1]{range}[0]; 5646 my $top = int $self->{children}[1]{range}[0];
2675 5647
2676 my $y0 = $top; 5648 my $y0 = $top;
2677 my $y1 = $top + $H; 5649 my $y1 = $top + $H;
2678 5650
2679 my $y = 0;
2680
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 5651 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 5652 my $h = $para->{h};
5653 my $y = $para->{y};
2691 5654
2692 if ($y0 < $y + $h && $y < $y1) { 5655 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 5656 my $layout = $self->get_layout ($para);
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 5657
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 5658 $layout->render ($para->{indent}, $y - $y0);
2699 5659
2700 glRasterPos $par->[3], $y - $y0; 5660 if (my @w = @{ $para->{widget} }) {
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 5661 my @s = $layout->get_shapes;
5662
5663 for (@w) {
5664 my ($dx, $dy) = splice @s, 0, 2, ();
5665
5666 $_->{x} = $dx + $para->{indent};
5667 $_->{y} = $dy + $y - $y0;
5668
5669 $_->draw;
5670 }
5671 }
2702 } 5672 }
2703 5673
2704 $y += $h; 5674 $paridx++;
5675 $top_paragraph ||= $paridx if $y >= $top;
2705 } 5676 }
2706 5677
2707 glDisable GL_BLEND; 5678 $self->{top_paragraph} = $top_paragraph;
2708 }; 5679 };
2709 }); 5680 });
5681}
5682
5683sub reconfigure {
5684 my ($self) = @_;
5685
5686 $self->SUPER::reconfigure;
5687
5688 $_->{w} = 1e10 for @{ $self->{par} };
5689 $self->reflow;
2710} 5690}
2711 5691
2712sub _draw { 5692sub _draw {
2713 my ($self) = @_; 5693 my ($self) = @_;
2714 5694
… …
2717 glColor 0, 0, 0, 1; 5697 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 5698 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 5699 glDisable GL_TEXTURE_2D;
2720 5700
2721 $self->{children}[1]->draw; 5701 $self->{children}[1]->draw;
2722
2723} 5702}
2724 5703
2725############################################################################# 5704#############################################################################
2726 5705
2727package CFClient::UI::Animator; 5706package CFPlus::UI::Animator;
2728 5707
2729use CFClient::OpenGL; 5708use CFPlus::OpenGL;
2730 5709
2731our @ISA = CFClient::UI::Bin::; 5710our @ISA = CFPlus::UI::Bin::;
2732 5711
2733sub moveto { 5712sub moveto {
2734 my ($self, $x, $y) = @_; 5713 my ($self, $x, $y) = @_;
2735 5714
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 5715 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 5743 glPopMatrix;
2765} 5744}
2766 5745
2767############################################################################# 5746#############################################################################
2768 5747
2769package CFClient::UI::Flopper; 5748package CFPlus::UI::Flopper;
2770 5749
2771our @ISA = CFClient::UI::Button::; 5750our @ISA = CFPlus::UI::Button::;
2772 5751
2773sub new { 5752sub new {
2774 my $class = shift; 5753 my $class = shift;
2775 5754
2776 my $self = $class->SUPER::new ( 5755 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 5767 $self->{other}->toggle_visibility;
2789} 5768}
2790 5769
2791############################################################################# 5770#############################################################################
2792 5771
2793package CFClient::UI::Tooltip; 5772package CFPlus::UI::Tooltip;
2794 5773
2795our @ISA = CFClient::UI::Bin::; 5774our @ISA = CFPlus::UI::Bin::;
2796 5775
2797use CFClient::OpenGL; 5776use CFPlus::OpenGL;
2798 5777
2799sub new { 5778sub new {
2800 my $class = shift; 5779 my $class = shift;
2801 5780
2802 $class->SUPER::new ( 5781 $class->SUPER::new (
… …
2805 ) 5784 )
2806} 5785}
2807 5786
2808sub set_tooltip_from { 5787sub set_tooltip_from {
2809 my ($self, $widget) = @_; 5788 my ($self, $widget) = @_;
5789
5790 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
5791 if $widget->{tooltip} =~ /^#(.*)$/;
2810 5792
2811 my $tooltip = $widget->{tooltip}; 5793 my $tooltip = $widget->{tooltip};
2812 5794
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 5795 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 5796 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 5800 }
2819 5801
2820 $tooltip =~ s/^\n+//; 5802 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 5803 $tooltip =~ s/\n+$//;
2822 5804
2823 $self->add (new CFClient::UI::Label 5805 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 5806 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 5807 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 5808 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 5809 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 5810 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 5811 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 5812 );
2831} 5813}
2832 5814
… …
2851 5833
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 5834 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 5835 my $widget = $self->{owner}
2854 or return; 5836 or return;
2855 5837
5838 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 5839 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 5840
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 5841 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 5842 if $x + $self->{w} > $self->{root}{w};
2860 5843
2861 $self->move_abs ($x, $y); 5844 $self->move_abs ($x, $y);
5845 } else {
5846 $self->hide;
5847 }
2862 }); 5848 });
2863} 5849}
2864 5850
2865sub _draw { 5851sub _draw {
2866 my ($self) = @_; 5852 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 5876 $self->SUPER::_draw;
2891} 5877}
2892 5878
2893############################################################################# 5879#############################################################################
2894 5880
2895package CFClient::UI::Face; 5881package CFPlus::UI::Face;
2896 5882
2897our @ISA = CFClient::UI::Base::; 5883our @ISA = CFPlus::UI::DrawBG::;
2898 5884
2899use CFClient::OpenGL; 5885use CFPlus::OpenGL;
2900 5886
2901sub new { 5887sub new {
2902 my $class = shift; 5888 my $class = shift;
2903 5889
2904 my $self = $class->SUPER::new ( 5890 my $self = $class->SUPER::new (
5891 size_w => 32,
5892 size_h => 8,
2905 aspect => 1, 5893 aspect => 1,
2906 can_events => 0, 5894 can_events => 0,
2907 @_, 5895 @_,
2908 ); 5896 );
2909 5897
2910 if ($self->{anim} && $self->{animspeed}) { 5898 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self); 5899 CFPlus::weaken (my $widget = $self);
2912 5900
5901 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
5902 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2913 $self->{timer} = Event->timer ( 5903 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1, 5904 parked => 1,
2916 interval => $self->{animspeed},
2917 cb => sub { 5905 cb => sub {
5906 return unless $::CONN && $widget;
5907
2918 ++$widget->{frame}; 5908 ++$widget->{frame};
5909 $widget->update_face;
2919 $widget->update; 5910 $widget->update;
5911
5912 $widget->update_timer;
2920 }, 5913 },
2921 ); 5914 );
5915
5916 $self->update_face;
5917 $self->update_timer;
2922 } 5918 }
2923 5919
2924 $self 5920 $self
2925} 5921}
2926 5922
5923sub update_timer {
5924 my ($self) = @_;
5925
5926 return unless $self->{timer};
5927
5928 if ($self->{visible}) {
5929 $self->{timer}->at (
5930 $self->{anim_start}
5931 + $self->{animspeed}
5932 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
5933 );
5934 $self->{timer}->start;
5935 } else {
5936 $self->{timer}->stop;
5937 }
5938}
5939
5940sub update_face {
5941 my ($self) = @_;
5942
5943 return unless $::CONN;
5944
5945 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
5946 if ($anim && @$anim) {
5947 delete $self->{wait_face};
5948 $self->{face} = $anim->[ $self->{frame} % @$anim ];
5949 }
5950 }
5951}
5952
2927sub size_request { 5953sub size_request {
2928 (32, 8) 5954 my ($self) = @_;
5955
5956 if ($::CONN) {
5957 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
5958 if (my $tex = $::CONN->{texture}[$faceid]) {
5959 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
5960 } else {
5961 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
5962 $self->realloc;
5963 });
5964 }
5965 }
5966 }
5967
5968 ($self->{size_w} || 8, $self->{size_h} || 8)
2929} 5969}
2930 5970
2931sub update { 5971sub update {
2932 my ($self) = @_; 5972 my ($self) = @_;
2933 5973
2934 return unless $self->{visible}; 5974 return unless $self->{visible};
2935 5975
2936 $self->SUPER::update; 5976 $self->SUPER::update;
2937} 5977}
2938 5978
5979sub invoke_visibility_change {
5980 my ($self) = @_;
5981
5982 $self->update_timer;
5983
5984 0
5985}
5986
2939sub _draw { 5987sub _draw {
2940 my ($self) = @_; 5988 my ($self) = @_;
2941 5989
2942 return unless $::CONN; 5990 return unless $::CONN;
2943 5991
2944 my $face; 5992 $self->SUPER::_draw;
2945 5993
2946 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 5994 my $faceid = $::CONN->{faceid}[$self->{face}]
2948 5995 or return;
2949 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim;
2951 }
2952 5996
2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 5997 my $tex = $::CONN->{texture}[$faceid];
2954 5998
2955 if ($tex) { 5999 if ($tex) {
2956 glEnable GL_TEXTURE_2D; 6000 glEnable GL_TEXTURE_2D;
2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 6001 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958 glColor 0, 0, 0, 1; 6002 glColor 0, 0, 0, 1;
… …
2962} 6006}
2963 6007
2964sub destroy { 6008sub destroy {
2965 my ($self) = @_; 6009 my ($self) = @_;
2966 6010
2967 $self->{timer}->cancel 6011 (delete $self->{timer})->cancel
2968 if $self->{timer}; 6012 if $self->{timer};
2969 6013
2970 $self->SUPER::destroy; 6014 $self->SUPER::destroy;
2971} 6015}
2972 6016
2973############################################################################# 6017#############################################################################
2974 6018
2975package CFClient::UI::Buttonbar; 6019package CFPlus::UI::Buttonbar;
2976 6020
2977our @ISA = CFClient::UI::HBox::; 6021our @ISA = CFPlus::UI::HBox::;
2978 6022
2979# TODO: should actualyl wrap buttons and other goodies. 6023# TODO: should actually wrap buttons and other goodies.
2980 6024
2981############################################################################# 6025#############################################################################
2982 6026
2983package CFClient::UI::Menu; 6027package CFPlus::UI::Menu;
2984 6028
2985our @ISA = CFClient::UI::FancyFrame::; 6029our @ISA = CFPlus::UI::Toplevel::;
2986 6030
2987use CFClient::OpenGL; 6031use CFPlus::OpenGL;
2988 6032
2989sub new { 6033sub new {
2990 my $class = shift; 6034 my $class = shift;
2991 6035
2992 my $self = $class->SUPER::new ( 6036 my $self = $class->SUPER::new (
2993 items => [], 6037 items => [],
2994 z => 100, 6038 z => 100,
2995 @_, 6039 @_,
2996 ); 6040 );
2997 6041
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 6042 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 6043
3000 for my $item (@{ $self->{items} }) { 6044 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 6045 my ($widget, $cb, $tooltip) = @$item;
3002 6046
3003 # handle various types of items, only text for now 6047 # handle various types of items, only text for now
3004 if (!ref $widget) { 6048 if (!ref $widget) {
6049 if ($widget =~ /\t/) {
6050 my ($left, $right) = split /\t/, $widget, 2;
6051
3005 $widget = new CFClient::UI::Label 6052 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 6053 can_hover => 1,
3007 can_events => 1, 6054 can_events => 1,
6055 tooltip => $tooltip,
6056 children => [
6057 (new CFPlus::UI::Label markup => $left, expand => 1),
6058 (new CFPlus::UI::Label markup => $right, align => +1),
6059 ],
6060 ;
6061
6062 } else {
6063 $widget = new CFPlus::UI::Label
6064 can_hover => 1,
6065 can_events => 1,
3008 markup => $widget, 6066 markup => $widget,
3009 tooltip => $tooltip 6067 tooltip => $tooltip;
6068 }
3010 } 6069 }
3011 6070
3012 $self->{item}{$widget} = $item; 6071 $self->{item}{$widget} = $item;
3013 6072
3014 $self->{vbox}->add ($widget); 6073 $self->{vbox}->add ($widget);
… …
3057 1 6116 1
3058} 6117}
3059 6118
3060############################################################################# 6119#############################################################################
3061 6120
3062package CFClient::UI::Multiplexer; 6121package CFPlus::UI::Multiplexer;
3063 6122
3064our @ISA = CFClient::UI::Container::; 6123our @ISA = CFPlus::UI::Container::;
3065 6124
3066sub new { 6125sub new {
3067 my $class = shift; 6126 my $class = shift;
3068 6127
3069 my $self = $class->SUPER::new ( 6128 my $self = $class->SUPER::new (
… …
3081 6140
3082 $self->SUPER::add (@widgets); 6141 $self->SUPER::add (@widgets);
3083 6142
3084 $self->{current} = $self->{children}[0] 6143 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 6144 if @{ $self->{children} };
6145}
6146
6147sub get_current_page {
6148 my ($self) = @_;
6149
6150 $self->{current}
3086} 6151}
3087 6152
3088sub set_current_page { 6153sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 6154 my ($self, $page_or_widget) = @_;
3090 6155
… …
3124 $self->{current}->draw; 6189 $self->{current}->draw;
3125} 6190}
3126 6191
3127############################################################################# 6192#############################################################################
3128 6193
3129package CFClient::UI::Notebook; 6194package CFPlus::UI::Notebook;
3130 6195
3131our @ISA = CFClient::UI::VBox::; 6196our @ISA = CFPlus::UI::VBox::;
3132 6197
3133sub new { 6198sub new {
3134 my $class = shift; 6199 my $class = shift;
3135 6200
3136 my $self = $class->SUPER::new ( 6201 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 6202 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 6203 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 6204 # filter => # will be put between multiplexer and $self
3140 @_, 6205 @_,
3141 ); 6206 );
3142 6207
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 6208 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3147} 6212}
3148 6213
3149sub add { 6214sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 6215 my ($self, $title, $widget, $tooltip) = @_;
3151 6216
3152 Scalar::Util::weaken $self; 6217 CFPlus::weaken $self;
3153 6218
3154 $self->{buttonbar}->add (new CFClient::UI::Button 6219 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 6220 markup => $title,
3156 tooltip => $tooltip, 6221 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 6222 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 6223 );
3159 6224
3160 $self->{multiplexer}->add ($widget); 6225 $self->{multiplexer}->add ($widget);
3161} 6226}
3162 6227
6228sub get_current_page {
6229 my ($self) = @_;
6230
6231 $self->{multiplexer}->get_current_page
6232}
6233
3163sub set_current_page { 6234sub set_current_page {
3164 my ($self, $page) = @_; 6235 my ($self, $page) = @_;
3165 6236
3166 $self->{multiplexer}->set_current_page ($page); 6237 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 6238 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 6239}
3169 6240
3170############################################################################# 6241#############################################################################
3171 6242
3172package CFClient::UI::Combobox; 6243package CFPlus::UI::Selector;
3173 6244
3174use utf8; 6245use utf8;
3175 6246
3176our @ISA = CFClient::UI::Button::; 6247our @ISA = CFPlus::UI::Button::;
3177 6248
3178sub new { 6249sub new {
3179 my $class = shift; 6250 my $class = shift;
3180 6251
3181 my $self = $class->SUPER::new ( 6252 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 6269 my ($value, $title, $tooltip) = @$_;
3199 6270
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 6271 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 6272 }
3202 6273
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 6274 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 6275}
3205 6276
3206sub _set_value { 6277sub _set_value {
3207 my ($self, $value) = @_; 6278 my ($self, $value) = @_;
3208 6279
… …
3223 $self->emit (changed => $value); 6294 $self->emit (changed => $value);
3224} 6295}
3225 6296
3226############################################################################# 6297#############################################################################
3227 6298
3228package CFClient::UI::Statusbox; 6299package CFPlus::UI::Statusbox;
3229 6300
3230our @ISA = CFClient::UI::VBox::; 6301our @ISA = CFPlus::UI::VBox::;
3231 6302
3232sub new { 6303sub new {
3233 my $class = shift; 6304 my $class = shift;
3234 6305
3235 my $self = $class->SUPER::new ( 6306 my $self = $class->SUPER::new (
3236 fontsize => 0.8, 6307 fontsize => 0.8,
3237 @_, 6308 @_,
3238 ); 6309 );
3239 6310
3240 Scalar::Util::weaken (my $this = $self); 6311 CFPlus::weaken (my $this = $self);
3241 6312
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 6313 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243 6314
3244 $self 6315 $self
3245} 6316}
… …
3247sub reorder { 6318sub reorder {
3248 my ($self) = @_; 6319 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 6320 my $NOW = Time::HiRes::time;
3250 6321
3251 # freeze display when hovering over any label 6322 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 6323 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 6324 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 6325 values %{ $self->{item} };
3255 6326
3256 while (my ($k, $v) = each %{ $self->{item} }) { 6327 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 6328 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 6329 }
… …
3279 for ($short) { 6350 for ($short) {
3280 s/^\s+//; 6351 s/^\s+//;
3281 s/\s+/ /g; 6352 s/\s+/ /g;
3282 } 6353 }
3283 6354
3284 new CFClient::UI::Label 6355 new CFPlus::UI::Label
3285 markup => $short, 6356 markup => $short,
3286 tooltip => $item->{tooltip}, 6357 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 6358 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 6359 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 6360 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 6414 count => 1,
3344 %arg, 6415 %arg,
3345 }; 6416 };
3346 } 6417 }
3347 6418
6419 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 6420 $self->reorder;
6421 });
3349} 6422}
3350 6423
3351sub reconfigure { 6424sub reconfigure {
3352 my ($self) = @_; 6425 my ($self) = @_;
3353 6426
… …
3366 $self->SUPER::destroy; 6439 $self->SUPER::destroy;
3367} 6440}
3368 6441
3369############################################################################# 6442#############################################################################
3370 6443
3371package CFClient::UI::Inventory;
3372
3373our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
3621 @_,
3622 )
3623}
3624
3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
3711 my ($self, $spell) = @_;
3712
3713 $self->{spell}->{$spell->{name}} = $spell;
3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3733package CFClient::UI::Root; 6444package CFPlus::UI::Root;
3734 6445
3735our @ISA = CFClient::UI::Container::; 6446our @ISA = CFPlus::UI::Container::;
3736 6447
3737use List::Util qw(min max); 6448use List::Util qw(min max);
3738 6449
3739use CFClient::OpenGL; 6450use CFPlus::OpenGL;
3740 6451
3741sub new { 6452sub new {
3742 my $class = shift; 6453 my $class = shift;
3743 6454
3744 my $self = $class->SUPER::new ( 6455 my $self = $class->SUPER::new (
3745 visible => 1, 6456 visible => 1,
3746 @_, 6457 @_,
3747 ); 6458 );
3748 6459
3749 Scalar::Util::weaken ($self->{root} = $self); 6460 CFPlus::weaken ($self->{root} = $self);
3750 6461
3751 $self 6462 $self
3752} 6463}
3753 6464
3754sub size_request { 6465sub size_request {
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 6631 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 6632
3922 $w = 0 if $w < 0; 6633 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 6634 $h = 0 if $h < 0;
3924 6635
6636 $w = max $widget->{min_w}, $w;
6637 $h = max $widget->{min_h}, $h;
6638
6639# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
6640# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
6641
6642 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
6643 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
6644
3925 $w = int $w + 0.5; 6645 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 6646 $h = int $h + 0.5;
3927 6647
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 6648 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 6649 $widget->{old_w} = $widget->{w};
… …
3939 6659
3940 while ($self->{post_alloc_hook}) { 6660 while ($self->{post_alloc_hook}) {
3941 $_->() 6661 $_->()
3942 for values %{delete $self->{post_alloc_hook}}; 6662 for values %{delete $self->{post_alloc_hook}};
3943 } 6663 }
3944
3945 6664
3946 glViewport 0, 0, $::WIDTH, $::HEIGHT; 6665 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 6666 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948 glClear GL_COLOR_BUFFER_BIT; 6667 glClear GL_COLOR_BUFFER_BIT;
3949 6668
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 6671 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 6672 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 6673 glLoadIdentity;
3955 6674
3956 { 6675 {
3957 package CFClient::UI::Base; 6676 package CFPlus::UI::Base;
3958 6677
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 6678 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 6679 (0, 0, $self->{w}, $self->{h});
3961 }
3962 6680
3963 $self->_draw; 6681 $self->_draw;
6682 }
3964} 6683}
3965 6684
3966############################################################################# 6685#############################################################################
3967 6686
3968package CFClient::UI; 6687package CFPlus::UI;
3969 6688
3970$ROOT = new CFClient::UI::Root; 6689$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 6690$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 6691
39731 66921
3974 6693

Diff Legend

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