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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 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
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::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
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 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 }
474} 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);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #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
480 (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
481 || ($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
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
539 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
540 607
541 # update screen rectangle 608 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 611
547 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 615
… …
573 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
576 glEnd; 641 glEnd;
577 glPopMatrix; 642 glPopMatrix;
578 #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;
579 } 644 }
580 645
581 $self->_draw; 646 $self->_draw;
582 glPopMatrix; 647 glPopMatrix;
583} 648}
… …
586 my ($self) = @_; 651 my ($self) = @_;
587 652
588 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
589} 654}
590 655
656my $cntx;#d#
591sub DESTROY { 657sub DESTROY {
592 my ($self) = @_; 658 my ($self) = @_;
593 659
594 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
595 661
596 eval { $self->destroy }; 662 eval { $self->destroy };
597 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};
598} 666}
599 667
600############################################################################# 668#############################################################################
601 669
602package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
603 671
604our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
605 673
606use strict; 674use strict;
607use CFClient::OpenGL; 675use CFPlus::OpenGL;
608 676
609sub new { 677sub new {
610 my $class = shift; 678 my $class = shift;
611 679
612 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
643 } 711 }
644} 712}
645 713
646############################################################################# 714#############################################################################
647 715
648package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
649 717
650our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
651 719
652sub new { 720sub new {
653 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
655} 723}
… …
662 730
663sub draw { } 731sub draw { }
664 732
665############################################################################# 733#############################################################################
666 734
667package CFClient::UI::Container; 735package CFPlus::UI::Container;
668 736
669our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
670 738
671sub new { 739sub new {
672 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
673 741
674 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
683 if $children; 751 if $children;
684 752
685 $self 753 $self
686} 754}
687 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
688sub add { 764sub add {
689 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
690 766
691 $_->set_parent ($self) 767 $_->set_parent ($self)
692 for @widgets; 768 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
753} 829}
754 830
755############################################################################# 831#############################################################################
756 832
757package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
758 834
759our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
760 836
761sub new { 837sub new {
762 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
763 839
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 841
766 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
767} 843}
768 844
769sub add { 845sub add {
… …
776sub remove { 852sub remove {
777 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
778 854
779 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
780 856
781 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 858 unless @{$self->{children}};
783} 859}
784 860
785sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
786 862
… …
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $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 {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
875our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
876 950
877sub new { 951sub new {
878 my $class = shift; 952 my $class = shift;
879 953
880 $class->SUPER::new ( 954 $class->SUPER::new (
… …
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1016 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1018 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1020 }
947} 1021}
948 1022
949sub _render { 1023sub _render {
950 my ($self) = @_; 1024 my ($self) = @_;
951 1025
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1028
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1030
957 $self->SUPER::_render; 1031 $self->SUPER::_render;
958} 1032}
959 1033
960############################################################################# 1034#############################################################################
961 1035
962package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
963 1037
964our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
965 1039
966sub new { 1040sub new {
967 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
968 1042
969 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
970 1044
971 my $self; 1045 my $self;
972 1046
973 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
974 vertical => 1, 1057 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1059 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1062 },
979 ; 1063 ;
980 1064
981 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
983 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
984 %arg, 1073 %arg,
985 ); 1074 );
986 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
988 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
989 1087
990 $self 1088 $self
991} 1089}
1090
1091#TODO# update range on size_allocate depending on child
992 1092
993sub add { 1093sub add {
994 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
995 1095
996 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
997} 1097}
998 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
999sub update { 1123sub update {
1000 my ($self) = @_; 1124 my ($self) = @_;
1001 1125
1002 $self->SUPER::update; 1126 $self->SUPER::update;
1003 1127 $self->update_slider;
1004 # todo: overwrite size_allocate of child
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007} 1128}
1008 1129
1009sub invoke_size_allocate { 1130sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1011 1132
1012 my $child = $self->{vp}->child; 1133 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1135}
1017 1136
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1137#############################################################################
1022 1138
1023package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1024 1140
1025our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1026 1142
1027use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1028 1144
1029sub new { 1145sub new {
1030 my $class = shift; 1146 my $class = shift;
1031 1147
1032 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1059} 1175}
1060 1176
1061############################################################################# 1177#############################################################################
1062 1178
1063package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1064 1180
1065our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1066 1182
1067use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1068 1284
1069my $bg = 1285my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1072 1288
1073my @border = 1289my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1292
1077sub new { 1293sub new {
1078 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1079 1295
1080 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1299 border => 0.6,
1084 can_events => 1, 1300 can_events => 1,
1085 min_w => 16, 1301 min_w => 64,
1086 min_h => 16, 1302 min_h => 32,
1087 %arg, 1303 %arg,
1088 ); 1304 );
1089 1305
1090 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1307 align => 0,
1092 valign => 1, 1308 valign => 1,
1093 text => $self->{title}, 1309 text => $self->{title},
1094 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1095 if exists $self->{title}; 1311 if exists $self->{title};
1096 1312
1097 if ($self->{has_close_button}) { 1313 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1314 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1316 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1317 on_activate => sub { $self->emit ("delete") };
1102 1318
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1320 }
1105 1321
1106 $self 1322 $self
1107} 1323}
1108 1324
1109sub add { 1325sub add {
1110 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1111 1327
1112 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1331}
1116 1332
1117sub border { 1333sub border {
1118 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1119} 1335}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1368 $self->child->configure ($border, $border, $w, $h);
1153 1369
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1371 if $self->{close_button};
1156 1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1380
1157 1 1381 1
1158} 1382}
1159 1383
1160sub invoke_button_down { 1384sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1444
1221 ! ! $self->{motion} 1445 ! ! $self->{motion}
1222} 1446}
1223 1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1454}
1455
1224sub _draw { 1456sub _draw {
1225 my ($self) = @_; 1457 my ($self) = @_;
1226 1458
1227 my $child = $self->{children}[0]; 1459 my $child = $self->{children}[0];
1228 1460
… …
1265 if $self->{close_button}; 1497 if $self->{close_button};
1266} 1498}
1267 1499
1268############################################################################# 1500#############################################################################
1269 1501
1270package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1271 1503
1272our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1273 1505
1274use List::Util qw(max sum); 1506use List::Util qw(max sum);
1275 1507
1276use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1277 1509
1278sub new { 1510sub new {
1279 my $class = shift; 1511 my $class = shift;
1280 1512
1281 $class->SUPER::new ( 1513 $class->SUPER::new (
1282 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1283 @_, 1516 @_,
1284 ) 1517 )
1285} 1518}
1286 1519
1287sub children { 1520sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1522}
1290 1523
1291sub add { 1524sub add {
1292 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1293 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1529 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1296 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1535 $self->realloc;
1298} 1536}
1299 1537
1300sub remove { 1538sub remove {
1301 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1358 1596
1359 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1361 1599
1362 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1366 1604
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1606
1371 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1372 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1373 1616
1374 my $y; 1617 my $y;
1375 1618
1376 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1420 } 1663 }
1421} 1664}
1422 1665
1423############################################################################# 1666#############################################################################
1424 1667
1425package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1426 1669
1427our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1428 1671
1429sub size_request { 1672sub size_request {
1430 my ($self) = @_; 1673 my ($self) = @_;
1431 1674
1432 $self->{vertical} 1675 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1709 for 0 .. $#children;
1467 } 1710 }
1468 } 1711 }
1469 1712
1470 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1471 1714
1472 my $pos = 0; 1715 my $pos = 0;
1473 for (0 .. $#children) { 1716 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1723 1
1481} 1724}
1482 1725
1483############################################################################# 1726#############################################################################
1484 1727
1485package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1486 1729
1487our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1488 1731
1489sub new { 1732sub new {
1490 my $class = shift; 1733 my $class = shift;
1491 1734
1492 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1495 ) 1738 )
1496} 1739}
1497 1740
1498############################################################################# 1741#############################################################################
1499 1742
1500package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1501 1744
1502our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1503 1746
1504sub new { 1747sub new {
1505 my $class = shift; 1748 my $class = shift;
1506 1749
1507 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1510 ) 1753 )
1511} 1754}
1512 1755
1513############################################################################# 1756#############################################################################
1514 1757
1515package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1516 1759
1517our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1518 1761
1519use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1520 1763
1521sub new { 1764sub new {
1522 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1523 1766
1524 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1770 #active_bg => none
1528 #font => default_font 1771 #font => default_font
1529 #text => initial text 1772 #text => initial text
1530 #markup => initial narkup 1773 #markup => initial narkup
1531 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1532 ellipsise => 3, # end 1776 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1778 fontsize => 1,
1535 align => -1, 1779 align => -1,
1536 valign => -1, 1780 valign => -1,
1537 padding_x => 2, 1781 padding_x => 2,
1538 padding_y => 2, 1782 padding_y => 2,
1539 can_events => 0, 1783 can_events => 0,
1540 %arg 1784 %arg
1541 ); 1785 );
1542 1786
1543 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1790 $self->{template} = $layout;
1547 } 1791 }
1548 1792
1549 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1553 } 1797 }
1554 1798
1555 $self 1799 $self
1556} 1800}
1557 1801
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1802sub update {
1569 my ($self) = @_; 1803 my ($self) = @_;
1570 1804
1571 delete $self->{texture}; 1805 delete $self->{texture};
1572 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1584 1818
1585 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1587 1821
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1590 1823
1591 delete $self->{size_req}; 1824 delete $self->{size_req};
1592 $self->realloc; 1825 $self->realloc;
1593 $self->update; 1826 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1601 1834
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1836
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1606 1838
1607 delete $self->{size_req}; 1839 delete $self->{size_req};
1608 $self->realloc; 1840 $self->realloc;
1609 $self->update; 1841 $self->update;
… …
1621 1853
1622 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1623 1855
1624 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1860
1628 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1629 1862
1630 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
… …
1654 1887
1655sub set_fontsize { 1888sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1657 1890
1658 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1659 delete $self->{texture}; 1893 delete $self->{texture};
1660 1894
1661 $self->realloc; 1895 $self->realloc;
1662} 1896}
1663 1897
1664sub reconfigure { 1898sub reconfigure {
1665 my ($self) = @_; 1899 my ($self) = @_;
1666 1900
1667 delete $self->{size_req}; 1901 delete $self->{size_req};
1902 delete $self->{texture};
1668 1903
1669 $self->SUPER::reconfigure; 1904 $self->SUPER::reconfigure;
1670} 1905}
1671 1906
1672sub _draw { 1907sub _draw {
1673 my ($self) = @_; 1908 my ($self) = @_;
1674 1909
1675 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1676 1911
1677 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1919
1685 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1686 }; 1921 };
1687 1922
1688 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1692 1927
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1931 };
1697 1932
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1935
1703 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1937}
1714 1938
1715############################################################################# 1939#############################################################################
1716 1940
1717package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1718 1942
1719our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1720 1944
1721use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1722 1946
1723sub new { 1947sub new {
1724 my $class = shift; 1948 my $class = shift;
1725 1949
1726 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1731 can_hover => 1, 1955 can_hover => 1,
1732 can_focus => 1, 1956 can_focus => 1,
1733 valign => 0, 1957 valign => 0,
1734 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1735 #text => ... 1960 #text => ...
1736 #hidden => "*", 1961 #hidden => "*",
1737 @_ 1962 @_
1738 ) 1963 )
1739} 1964}
… …
1784 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1786 2011
1787 my $text = $self->get_text; 2012 my $text = $self->get_text;
1788 2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015
1789 if ($uni == 8) { 2016 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1798 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2040 $self->emit ('escape');
1803 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2045 } else {
1806 return 0; 2046 return 0;
1807 } 2047 }
1808 2048
1809 $self->_set_text ($text); 2049 $self->_set_text ($text);
1810 2050
1811 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1812 2053
1813 1 2054 1
1814} 2055}
1815 2056
1816sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1828 2069
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2071
1831 # byte-index to char-index 2072 # byte-index to char-index
1832 my $text = $self->{text}; 2073 my $text = $self->{text};
1833 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1835 2076
1836 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1837 $self->update; 2078 $self->update;
1838 2079
1839 1 2080 1
… …
1878 utf8::encode $text; 2119 utf8::encode $text;
1879 2120
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2122 }
1882 2123
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2124 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2127 glEnd;
1888 } 2128 }
1889} 2129}
1890 2130
2131#############################################################################
2132
1891package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1892 2134
1893our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1894 2136
1895use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1896 2138
1897sub invoke_key_down { 2139sub invoke_key_down {
1898 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1899 2141
1900 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1901 2143
1902 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1905 2147
1906 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1909 $self->update; 2151 $self->update;
1910 2152
1911 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1914 } 2156 }
1915 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2161 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2163 }
1922 2164
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2168
1927 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2179 1
1938} 2180}
1939 2181
1940############################################################################# 2182#############################################################################
1941 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1942package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1943 2224
1944our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1945 2226
1946use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1947 2228
1948my @tex = 2229my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1951 2232
1952sub new { 2233sub new {
1953 my $class = shift; 2234 my $class = shift;
1954 2235
… …
1991 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1992} 2273}
1993 2274
1994############################################################################# 2275#############################################################################
1995 2276
2277package CFPlus::UI::CheckBox;
2278
2279our @ISA = CFPlus::UI::DrawBG::;
2280
2281my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284
2285use CFPlus::OpenGL;
2286
2287sub new {
2288 my $class = shift;
2289
2290 $class->SUPER::new (
2291 padding_x => 2,
2292 padding_y => 2,
2293 fg => [1, 1, 1],
2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
2297 state => 0,
2298 can_hover => 1,
2299 @_
2300 )
2301}
2302
2303sub size_request {
2304 my ($self) = @_;
2305
2306 (6) x 2
2307}
2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
2317sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_;
2319
2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2322 $self->toggle;
2323 } else {
2324 return 0
2325 }
2326
2327 1
2328}
2329
2330sub _draw {
2331 my ($self) = @_;
2332
2333 $self->SUPER::_draw;
2334
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2336
2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340
2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2342
2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
2344
2345 glEnable GL_TEXTURE_2D;
2346 $tex->draw_quad_alpha (0, 0, $s, $s);
2347 glDisable GL_TEXTURE_2D;
2348}
2349
2350#############################################################################
2351
2352package CFPlus::UI::Image;
2353
2354our @ISA = CFPlus::UI::Base::;
2355
2356use CFPlus::OpenGL;
2357
2358our %texture_cache;
2359
2360sub new {
2361 my $class = shift;
2362
2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2367
2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2370
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2373
2374 CFPlus::weaken $texture_cache{$self->{path}};
2375
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377
2378 $self
2379}
2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2396sub size_request {
2397 my ($self) = @_;
2398
2399 ($self->{tex}{w}, $self->{tex}{h})
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 my $tex = $self->{tex};
2406
2407 my ($w, $h) = ($self->{w}, $self->{h});
2408
2409 if ($self->{rot90}) {
2410 glRotate 90, 0, 0, 1;
2411 glTranslate 0, -$self->{w}, 0;
2412
2413 ($w, $h) = ($h, $w);
2414 }
2415
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418
2419 $tex->draw_quad (0, 0, $w, $h);
2420
2421 glDisable GL_TEXTURE_2D;
2422}
2423
2424#############################################################################
2425
1996package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
1997 2427
1998our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
1999 2429
2000use CFClient::OpenGL; 2430use CFPlus::OpenGL;
2001 2431
2002my %textures; 2432my %textures;
2003 2433
2004sub new { 2434sub new {
2005 my $class = shift; 2435 my $class = shift;
… …
2027 1 2457 1
2028} 2458}
2029 2459
2030############################################################################# 2460#############################################################################
2031 2461
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2462package CFPlus::UI::VGauge;
2101 2463
2102our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2465
2163use List::Util qw(min max); 2466use List::Util qw(min max);
2164 2467
2165use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2166 2469
2167my %tex = ( 2470my %tex = (
2168 food => [ 2471 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2474 ],
2172 grace => [ 2475 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2478 ],
2176 hp => [ 2479 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2482 ],
2180 mana => [ 2483 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2486 ],
2184); 2487);
2185 2488
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2551
2249 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2557
2252 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2274 2580
2275 if ($t3) { 2581 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2588 glEnd;
2283 } 2589 }
2284 2590
2285 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2287} 2593}
2288 2594
2289############################################################################# 2595#############################################################################
2290 2596
2291package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2292 2598
2293our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2294 2600
2295sub new { 2601sub new {
2296 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2297 2603
2298 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2606 can_hover => 1,
2301 can_events => 1, 2607 can_events => 1,
2302 %arg, 2608 %arg,
2303 ); 2609 );
2304 2610
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2614
2309 $self 2615 $self
2310} 2616}
2311 2617
2312sub set_fontsize { 2618sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2334} 2640}
2335 2641
2336############################################################################# 2642#############################################################################
2337 2643
2338package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2339 2645
2340use strict; 2646use strict;
2341 2647
2342use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2343 2649
2344our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2345 2651
2346my @tex = 2652my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2349 2655
2350sub new { 2656sub new {
2351 my $class = shift; 2657 my $class = shift;
2352 2658
… …
2441 } 2747 }
2442 2748
2443 1 2749 1
2444} 2750}
2445 2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2762}
2763
2446sub update { 2764sub update {
2447 my ($self) = @_; 2765 my ($self) = @_;
2448 2766
2449 delete $self->{knob_w}; 2767 delete $self->{knob_w};
2450 $self->SUPER::update; 2768 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2498} 2816}
2499 2817
2500############################################################################# 2818#############################################################################
2501 2819
2502package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2503 2821
2504our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2505 2823
2506sub new { 2824sub new {
2507 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2508 2826
2509 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2510 2828
2511 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2832 to_value => sub { shift },
2515 from_value => sub { shift }, 2833 from_value => sub { shift },
2516 %arg, 2834 %arg,
2517 ); 2835 );
2518 2836
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2540 2858
2541############################################################################# 2859#############################################################################
2542 2860
2543package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2544 2862
2545our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2546 2864
2547use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2548 2866
2549sub new { 2867sub new {
2550 my $class = shift; 2868 my $class = shift;
2551 2869
2552 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2553 fontsize => 1, 2871 fontsize => 1,
2554 can_events => 0, 2872 can_events => 1,
2555 indent => 0, 2873 indent => 0,
2556 #font => default_font 2874 #font => default_font
2557 @_, 2875 @_,
2558 2876
2559 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2560 par => [], 2878 par => [],
2879 max_par => 0,
2561 height => 0, 2880 height => 0,
2562 children => [ 2881 children => [
2563 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2884 ],
2566 ); 2885 );
2567 2886
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2888
… …
2575 2894
2576 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2896 $self->reflow;
2578} 2897}
2579 2898
2580sub visible_children { 2899sub size_request {
2581 my ($self) = @_; 2900 my ($self) = @_;
2582 2901
2583 @{$self->{children}}[0,1] 2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2584} 2906}
2585 2907
2586sub invoke_size_allocate { 2908sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2588 2910
… …
2594 $self->{layout}->set_width ($empty->{w}); 2916 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2918
2597 $self->reflow; 2919 $self->reflow;
2598 2920
2921 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2600} 2933}
2601 2934
2602sub get_layout { 2935sub get_layout {
2603 my ($self, $para) = @_; 2936 my ($self, $para) = @_;
2604 2937
… …
2632 2965
2633 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2635} 2968}
2636 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2637sub clear { 2985sub clear {
2638 my ($self) = @_; 2986 my ($self) = @_;
2639 2987
2640 my (undef, undef, @other) = @{ $self->{children} }; 2988 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 2989 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 2992 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 2994}
2647 2995
2648sub add_paragraph { 2996sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 2997 my $self = shift;
2650 2998
2651 my ($text, @w) = ref $para ? @$para : $para; 2999 for my $para (@_) {
2652
2653 $para = { 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3006 w => 1e10,
2655 wrapped => 1, 3007 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3008 };
2661 3009
2662 $self->add (@w) if @w; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
2664 3017
2665 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2666 $self->update; 3019 $self->update;
2667} 3020}
2668 3021
2669sub scroll_to_bottom { 3022sub scroll_to_bottom {
2670 my ($self) = @_; 3023 my ($self) = @_;
2671 3024
2672 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3026 $self->update;
2674} 3027}
2675 3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3053
3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
3060}
3061
2676sub update { 3062sub update {
2677 my ($self) = @_; 3063 my ($self) = @_;
2678 3064
2679 $self->SUPER::update; 3065 $self->SUPER::update;
2680 3066
2681 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2682 3068
2683 delete $self->{texture}; 3069 delete $self->{texture};
2684 3070
2685 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3075
2688 if (delete $self->{need_reflow}) {
2689 my $height = 0;
2690
2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2703
2704 $self->{height} = $height;
2705
2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2718 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2720 3089
2721 my $y0 = $top; 3090 my $y0 = $top;
2722 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2723 3092
2724 my $y = 0;
2725
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2732 3096
2733 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2736 3099
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3100 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3101
2742 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3103 my @s = $layout->get_shapes;
2744 3104
2745 for (@w) { 3105 for (@w) {
… …
2751 $_->draw; 3111 $_->draw;
2752 } 3112 }
2753 } 3113 }
2754 } 3114 }
2755 3115
2756 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3118 }
2758 3119
2759 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2760 }; 3121 };
2761 }); 3122 });
2762} 3123}
2763 3124
2764sub reconfigure { 3125sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2783} 3144}
2784 3145
2785############################################################################# 3146#############################################################################
2786 3147
2787package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2788 3149
2789use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2790 3151
2791our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2792 3153
2793sub moveto { 3154sub moveto {
2794 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2795 3156
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3185 glPopMatrix;
2825} 3186}
2826 3187
2827############################################################################# 3188#############################################################################
2828 3189
2829package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2830 3191
2831our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2832 3193
2833sub new { 3194sub new {
2834 my $class = shift; 3195 my $class = shift;
2835 3196
2836 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2849} 3210}
2850 3211
2851############################################################################# 3212#############################################################################
2852 3213
2853package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2854 3215
2855our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2856 3217
2857use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2858 3219
2859sub new { 3220sub new {
2860 my $class = shift; 3221 my $class = shift;
2861 3222
2862 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2865 ) 3226 )
2866} 3227}
2867 3228
2868sub set_tooltip_from { 3229sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3234
2871 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2872 3236
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3242 }
2879 3243
2880 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2882 3246
2883 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3248 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3250 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3252 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3254 );
2891} 3255}
2892 3256
… …
2911 3275
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2914 or return; 3278 or return;
2915 3279
3280 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3282
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2920 3285
2921 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2922 }); 3290 });
2923} 3291}
2924 3292
2925sub _draw { 3293sub _draw {
2926 my ($self) = @_; 3294 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2951} 3319}
2952 3320
2953############################################################################# 3321#############################################################################
2954 3322
2955package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2956 3324
2957our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2958 3326
2959use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2960 3328
2961sub new { 3329sub new {
2962 my $class = shift; 3330 my $class = shift;
2963 3331
2964 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2966 can_events => 0, 3334 can_events => 0,
2967 @_, 3335 @_,
2968 ); 3336 );
2969 3337
2970 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2972 3340
2973 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3343 hard => 1,
2976 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2977 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2978 ++$widget->{frame}; 3347 ++$widget->{frame};
2979 $widget->update; 3348 $widget->update;
2980 }, 3349 },
2981 ); 3350 );
2982 } 3351 }
… …
2999sub _draw { 3368sub _draw {
3000 my ($self) = @_; 3369 my ($self) = @_;
3001 3370
3002 return unless $::CONN; 3371 return unless $::CONN;
3003 3372
3373 $self->SUPER::_draw;
3374
3004 my $face; 3375 my $face;
3005 3376
3006 if ($self->{frame}) { 3377 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
3008 3379
3009 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim; 3381 if $anim && @$anim;
3011 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3012 3386
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
3014 3388
3015 if ($tex) { 3389 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3020 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3021 } 3399 }
3022} 3400}
3023 3401
3024sub destroy { 3402sub destroy {
3025 my ($self) = @_; 3403 my ($self) = @_;
… …
3030 $self->SUPER::destroy; 3408 $self->SUPER::destroy;
3031} 3409}
3032 3410
3033############################################################################# 3411#############################################################################
3034 3412
3035package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
3036 3414
3037our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
3038 3416
3039# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
3040 3418
3041############################################################################# 3419#############################################################################
3042 3420
3043package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
3044 3422
3045our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
3046 3424
3047use CFClient::OpenGL; 3425use CFPlus::OpenGL;
3048 3426
3049sub new { 3427sub new {
3050 my $class = shift; 3428 my $class = shift;
3051 3429
3052 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
3053 items => [], 3431 items => [],
3054 z => 100, 3432 z => 100,
3055 @_, 3433 @_,
3056 ); 3434 );
3057 3435
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3437
3060 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
3062 3440
3063 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
3064 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
3065 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3447 can_hover => 1,
3067 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
3068 markup => $widget, 3460 markup => $widget,
3069 tooltip => $tooltip 3461 tooltip => $tooltip;
3462 }
3070 } 3463 }
3071 3464
3072 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
3073 3466
3074 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
3117 1 3510 1
3118} 3511}
3119 3512
3120############################################################################# 3513#############################################################################
3121 3514
3122package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
3123 3516
3124our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
3125 3518
3126sub new { 3519sub new {
3127 my $class = shift; 3520 my $class = shift;
3128 3521
3129 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3143 3536
3144 $self->{current} = $self->{children}[0] 3537 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3538 if @{ $self->{children} };
3146} 3539}
3147 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3148sub set_current_page { 3547sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3548 my ($self, $page_or_widget) = @_;
3150 3549
3151 my $widget = ref $page_or_widget 3550 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3551 ? $page_or_widget
… …
3184 $self->{current}->draw; 3583 $self->{current}->draw;
3185} 3584}
3186 3585
3187############################################################################# 3586#############################################################################
3188 3587
3189package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3190 3589
3191our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3192 3591
3193sub new { 3592sub new {
3194 my $class = shift; 3593 my $class = shift;
3195 3594
3196 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3200 @_, 3599 @_,
3201 ); 3600 );
3202 3601
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3606}
3208 3607
3209sub add { 3608sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3211 3610
3212 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3213 3612
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3614 markup => $title,
3216 tooltip => $tooltip, 3615 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3617 );
3219 3618
3220 $self->{multiplexer}->add ($widget); 3619 $self->{multiplexer}->add ($widget);
3221} 3620}
3222 3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3223sub set_current_page { 3628sub set_current_page {
3224 my ($self, $page) = @_; 3629 my ($self, $page) = @_;
3225 3630
3226 $self->{multiplexer}->set_current_page ($page); 3631 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3633}
3229 3634
3230############################################################################# 3635#############################################################################
3231 3636
3232package CFClient::UI::Combobox; 3637package CFPlus::UI::Selector;
3233 3638
3234use utf8; 3639use utf8;
3235 3640
3236our @ISA = CFClient::UI::Button::; 3641our @ISA = CFPlus::UI::Button::;
3237 3642
3238sub new { 3643sub new {
3239 my $class = shift; 3644 my $class = shift;
3240 3645
3241 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3663 my ($value, $title, $tooltip) = @$_;
3259 3664
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3666 }
3262 3667
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3669}
3265 3670
3266sub _set_value { 3671sub _set_value {
3267 my ($self, $value) = @_; 3672 my ($self, $value) = @_;
3268 3673
… …
3283 $self->emit (changed => $value); 3688 $self->emit (changed => $value);
3284} 3689}
3285 3690
3286############################################################################# 3691#############################################################################
3287 3692
3288package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3289 3694
3290our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3291 3696
3292sub new { 3697sub new {
3293 my $class = shift; 3698 my $class = shift;
3294 3699
3295 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3701 fontsize => 0.8,
3297 @_, 3702 @_,
3298 ); 3703 );
3299 3704
3300 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3301 3706
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3708
3304 $self 3709 $self
3305} 3710}
… …
3307sub reorder { 3712sub reorder {
3308 my ($self) = @_; 3713 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3310 3715
3311 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3315 3720
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3723 }
… …
3339 for ($short) { 3744 for ($short) {
3340 s/^\s+//; 3745 s/^\s+//;
3341 s/\s+/ /g; 3746 s/\s+/ /g;
3342 } 3747 }
3343 3748
3344 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3345 markup => $short, 3750 markup => $short,
3346 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 3808 count => 1,
3404 %arg, 3809 %arg,
3405 }; 3810 };
3406 } 3811 }
3407 3812
3813 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3814 $self->reorder;
3815 });
3409} 3816}
3410 3817
3411sub reconfigure { 3818sub reconfigure {
3412 my ($self) = @_; 3819 my ($self) = @_;
3413 3820
… …
3426 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3427} 3834}
3428 3835
3429############################################################################# 3836#############################################################################
3430 3837
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3804 3839
3805our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3806 3841
3807use List::Util qw(min max); 3842use List::Util qw(min max);
3808 3843
3809use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3810 3845
3811sub new { 3846sub new {
3812 my $class = shift; 3847 my $class = shift;
3813 3848
3814 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3815 visible => 1, 3850 visible => 1,
3816 @_, 3851 @_,
3817 ); 3852 );
3818 3853
3819 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3820 3855
3821 $self 3856 $self
3822} 3857}
3823 3858
3824sub size_request { 3859sub size_request {
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4026
3992 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3994 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3995 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3997 4041
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4043 $widget->{old_w} = $widget->{w};
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4068 glLoadIdentity;
4025 4069
4026 { 4070 {
4027 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
4028 4072
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4075
4033 $self->_draw; 4076 $self->_draw;
4077 }
4034} 4078}
4035 4079
4036############################################################################# 4080#############################################################################
4037 4081
4038package CFClient::UI; 4082package CFPlus::UI;
4039 4083
4040$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4086
40431 40871
4044 4088

Diff Legend

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