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.371 by root, Sun Jul 15 22:07:48 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 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
983 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
984 %arg, 1072 %arg,
985 ); 1073 );
986 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
988 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
989 1080
990 $self 1081 $self
991} 1082}
1083
1084#TODO# update range on size_allocate depending on child
992 1085
993sub add { 1086sub add {
994 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
995 1088
996 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
997} 1090}
998 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
999sub update { 1116sub update {
1000 my ($self) = @_; 1117 my ($self) = @_;
1001 1118
1002 $self->SUPER::update; 1119 $self->SUPER::update;
1003 1120 $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} 1121}
1008 1122
1009sub invoke_size_allocate { 1123sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1011 1125
1012 my $child = $self->{vp}->child; 1126 $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) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1128}
1017 1129
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1130#############################################################################
1022 1131
1023package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1024 1133
1025our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1026 1135
1027use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1028 1137
1029sub new { 1138sub new {
1030 my $class = shift; 1139 my $class = shift;
1031 1140
1032 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1059} 1168}
1060 1169
1061############################################################################# 1170#############################################################################
1062 1171
1063package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1064 1173
1065our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1066 1175
1067use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1068 1277
1069my $bg = 1278my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1072 1281
1073my @border = 1282my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 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); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1285
1077sub new { 1286sub new {
1078 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1079 1288
1080 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1292 border => 0.6,
1084 can_events => 1, 1293 can_events => 1,
1085 min_w => 16, 1294 min_w => 64,
1086 min_h => 16, 1295 min_h => 32,
1087 %arg, 1296 %arg,
1088 ); 1297 );
1089 1298
1090 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1300 align => 0,
1092 valign => 1, 1301 valign => 1,
1093 text => $self->{title}, 1302 text => $self->{title},
1094 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1095 if exists $self->{title}; 1304 if exists $self->{title};
1096 1305
1097 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1307 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1309 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1310 on_activate => sub { $self->emit ("delete") };
1102 1311
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1313 }
1105 1314
1106 $self 1315 $self
1107} 1316}
1108 1317
1109sub add { 1318sub add {
1110 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1111 1320
1112 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $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}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1324}
1116 1325
1117sub border { 1326sub border {
1118 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1119} 1328}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1361 $self->child->configure ($border, $border, $w, $h);
1153 1362
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1364 if $self->{close_button};
1156 1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1373
1157 1 1374 1
1158} 1375}
1159 1376
1160sub invoke_button_down { 1377sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1437
1221 ! ! $self->{motion} 1438 ! ! $self->{motion}
1222} 1439}
1223 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1224sub _draw { 1449sub _draw {
1225 my ($self) = @_; 1450 my ($self) = @_;
1226 1451
1227 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1228 1453
… …
1265 if $self->{close_button}; 1490 if $self->{close_button};
1266} 1491}
1267 1492
1268############################################################################# 1493#############################################################################
1269 1494
1270package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1271 1496
1272our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1273 1498
1274use List::Util qw(max sum); 1499use List::Util qw(max sum);
1275 1500
1276use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1277 1502
1278sub new { 1503sub new {
1279 my $class = shift; 1504 my $class = shift;
1280 1505
1281 $class->SUPER::new ( 1506 $class->SUPER::new (
1282 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1283 @_, 1509 @_,
1284 ) 1510 )
1285} 1511}
1286 1512
1287sub children { 1513sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1515}
1290 1516
1291sub add { 1517sub add {
1292 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1293 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1522 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1296 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1528 $self->realloc;
1298} 1529}
1299 1530
1300sub remove { 1531sub remove {
1301 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1358 1589
1359 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1361 1592
1362 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1366 1597
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1599
1371 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1372 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1373 1609
1374 my $y; 1610 my $y;
1375 1611
1376 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1420 } 1656 }
1421} 1657}
1422 1658
1423############################################################################# 1659#############################################################################
1424 1660
1425package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1426 1662
1427our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1428 1664
1429sub size_request { 1665sub size_request {
1430 my ($self) = @_; 1666 my ($self) = @_;
1431 1667
1432 $self->{vertical} 1668 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1702 for 0 .. $#children;
1467 } 1703 }
1468 } 1704 }
1469 1705
1470 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1471 1707
1472 my $pos = 0; 1708 my $pos = 0;
1473 for (0 .. $#children) { 1709 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1716 1
1481} 1717}
1482 1718
1483############################################################################# 1719#############################################################################
1484 1720
1485package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1486 1722
1487our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1488 1724
1489sub new { 1725sub new {
1490 my $class = shift; 1726 my $class = shift;
1491 1727
1492 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1495 ) 1731 )
1496} 1732}
1497 1733
1498############################################################################# 1734#############################################################################
1499 1735
1500package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1501 1737
1502our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1503 1739
1504sub new { 1740sub new {
1505 my $class = shift; 1741 my $class = shift;
1506 1742
1507 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1510 ) 1746 )
1511} 1747}
1512 1748
1513############################################################################# 1749#############################################################################
1514 1750
1515package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1516 1752
1517our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1518 1754
1519use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1520 1756
1521sub new { 1757sub new {
1522 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1523 1759
1524 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1763 #active_bg => none
1528 #font => default_font 1764 #font => default_font
1529 #text => initial text 1765 #text => initial text
1530 #markup => initial narkup 1766 #markup => initial narkup
1531 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1532 ellipsise => 3, # end 1769 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1771 fontsize => 1,
1535 align => -1, 1772 align => -1,
1536 valign => -1, 1773 valign => -1,
1537 padding_x => 2, 1774 padding_x => 2,
1538 padding_y => 2, 1775 padding_y => 2,
1539 can_events => 0, 1776 can_events => 0,
1540 %arg 1777 %arg
1541 ); 1778 );
1542 1779
1543 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1783 $self->{template} = $layout;
1547 } 1784 }
1548 1785
1549 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1553 } 1790 }
1554 1791
1555 $self 1792 $self
1556} 1793}
1557 1794
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1795sub update {
1569 my ($self) = @_; 1796 my ($self) = @_;
1570 1797
1571 delete $self->{texture}; 1798 delete $self->{texture};
1572 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1584 1811
1585 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1587 1814
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1590 1816
1591 delete $self->{size_req}; 1817 delete $self->{size_req};
1592 $self->realloc; 1818 $self->realloc;
1593 $self->update; 1819 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1601 1827
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1829
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1606 1831
1607 delete $self->{size_req}; 1832 delete $self->{size_req};
1608 $self->realloc; 1833 $self->realloc;
1609 $self->update; 1834 $self->update;
… …
1621 1846
1622 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1623 1848
1624 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1853
1628 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1629 1855
1630 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
… …
1654 1880
1655sub set_fontsize { 1881sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1657 1883
1658 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1659 delete $self->{texture}; 1886 delete $self->{texture};
1660 1887
1661 $self->realloc; 1888 $self->realloc;
1662} 1889}
1663 1890
1664sub reconfigure { 1891sub reconfigure {
1665 my ($self) = @_; 1892 my ($self) = @_;
1666 1893
1667 delete $self->{size_req}; 1894 delete $self->{size_req};
1895 delete $self->{texture};
1668 1896
1669 $self->SUPER::reconfigure; 1897 $self->SUPER::reconfigure;
1670} 1898}
1671 1899
1672sub _draw { 1900sub _draw {
1673 my ($self) = @_; 1901 my ($self) = @_;
1674 1902
1675 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1676 1904
1677 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1912
1685 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1686 }; 1914 };
1687 1915
1688 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1692 1920
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1924 };
1697 1925
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1928
1703 if ($tex->{format} == GL_ALPHA) { 1929 $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} 1930}
1714 1931
1715############################################################################# 1932#############################################################################
1716 1933
1717package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1718 1935
1719our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1720 1937
1721use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1722 1939
1723sub new { 1940sub new {
1724 my $class = shift; 1941 my $class = shift;
1725 1942
1726 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1731 can_hover => 1, 1948 can_hover => 1,
1732 can_focus => 1, 1949 can_focus => 1,
1733 valign => 0, 1950 valign => 0,
1734 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1735 #text => ... 1953 #text => ...
1736 #hidden => "*", 1954 #hidden => "*",
1737 @_ 1955 @_
1738 ) 1956 )
1739} 1957}
… …
1784 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1786 2004
1787 my $text = $self->get_text; 2005 my $text = $self->get_text;
1788 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1789 if ($uni == 8) { 2009 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1798 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2033 $self->emit ('escape');
1803 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2038 } else {
1806 return 0; 2039 return 0;
1807 } 2040 }
1808 2041
1809 $self->_set_text ($text); 2042 $self->_set_text ($text);
1810 2043
1811 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1812 2046
1813 1 2047 1
1814} 2048}
1815 2049
1816sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1828 2062
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2064
1831 # byte-index to char-index 2065 # byte-index to char-index
1832 my $text = $self->{text}; 2066 my $text = $self->{text};
1833 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1835 2069
1836 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1837 $self->update; 2071 $self->update;
1838 2072
1839 1 2073 1
… …
1878 utf8::encode $text; 2112 utf8::encode $text;
1879 2113
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2115 }
1882 2116
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2117 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 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}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2120 glEnd;
1888 } 2121 }
1889} 2122}
1890 2123
2124#############################################################################
2125
1891package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1892 2127
1893our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1894 2129
1895use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1896 2131
1897sub invoke_key_down { 2132sub invoke_key_down {
1898 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1899 2134
1900 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1901 2136
1902 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1905 2140
1906 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1909 $self->update; 2144 $self->update;
1910 2145
1911 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1914 } 2149 }
1915 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2154 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2156 }
1922 2157
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2161
1927 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2172 1
1938} 2173}
1939 2174
1940############################################################################# 2175#############################################################################
1941 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1942package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1943 2217
1944our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1945 2219
1946use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1947 2221
1948my @tex = 2222my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1951 2225
1952sub new { 2226sub new {
1953 my $class = shift; 2227 my $class = shift;
1954 2228
… …
1991 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1992} 2266}
1993 2267
1994############################################################################# 2268#############################################################################
1995 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
1996package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
1997 2420
1998our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
1999 2422
2000use CFClient::OpenGL; 2423use CFPlus::OpenGL;
2001 2424
2002my %textures; 2425my %textures;
2003 2426
2004sub new { 2427sub new {
2005 my $class = shift; 2428 my $class = shift;
… …
2027 1 2450 1
2028} 2451}
2029 2452
2030############################################################################# 2453#############################################################################
2031 2454
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; 2455package CFPlus::UI::VGauge;
2101 2456
2102our @ISA = CFClient::UI::Base::; 2457our @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 2458
2163use List::Util qw(min max); 2459use List::Util qw(min max);
2164 2460
2165use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2166 2462
2167my %tex = ( 2463my %tex = (
2168 food => [ 2464 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2467 ],
2172 grace => [ 2468 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 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/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2471 ],
2176 hp => [ 2472 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2475 ],
2180 mana => [ 2476 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 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/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2479 ],
2184); 2480);
2185 2481
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2544
2249 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2550
2252 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2274 2573
2275 if ($t3) { 2574 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2581 glEnd;
2283 } 2582 }
2284 2583
2285 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2287} 2586}
2288 2587
2289############################################################################# 2588#############################################################################
2290 2589
2291package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2292 2591
2293our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2294 2593
2295sub new { 2594sub new {
2296 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2297 2596
2298 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2599 can_hover => 1,
2301 can_events => 1, 2600 can_events => 1,
2302 %arg, 2601 %arg,
2303 ); 2602 );
2304 2603
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $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); 2605 $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"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2607
2309 $self 2608 $self
2310} 2609}
2311 2610
2312sub set_fontsize { 2611sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2334} 2633}
2335 2634
2336############################################################################# 2635#############################################################################
2337 2636
2338package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2339 2638
2340use strict; 2639use strict;
2341 2640
2342use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2343 2642
2344our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2345 2644
2346my @tex = 2645my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2349 2648
2350sub new { 2649sub new {
2351 my $class = shift; 2650 my $class = shift;
2352 2651
… …
2441 } 2740 }
2442 2741
2443 1 2742 1
2444} 2743}
2445 2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2446sub update { 2757sub update {
2447 my ($self) = @_; 2758 my ($self) = @_;
2448 2759
2449 delete $self->{knob_w}; 2760 delete $self->{knob_w};
2450 $self->SUPER::update; 2761 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2498} 2809}
2499 2810
2500############################################################################# 2811#############################################################################
2501 2812
2502package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2503 2814
2504our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2505 2816
2506sub new { 2817sub new {
2507 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2508 2819
2509 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2510 2821
2511 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2825 to_value => sub { shift },
2515 from_value => sub { shift }, 2826 from_value => sub { shift },
2516 %arg, 2827 %arg,
2517 ); 2828 );
2518 2829
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2540 2851
2541############################################################################# 2852#############################################################################
2542 2853
2543package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2544 2855
2545our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2546 2857
2547use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2548 2859
2549sub new { 2860sub new {
2550 my $class = shift; 2861 my $class = shift;
2551 2862
2552 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2553 fontsize => 1, 2864 fontsize => 1,
2554 can_events => 0, 2865 can_events => 1,
2555 indent => 0, 2866 indent => 0,
2556 #font => default_font 2867 #font => default_font
2557 @_, 2868 @_,
2558 2869
2559 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2560 par => [], 2871 par => [],
2872 max_par => 0,
2561 height => 0, 2873 height => 0,
2562 children => [ 2874 children => [
2563 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2877 ],
2566 ); 2878 );
2567 2879
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2881
… …
2575 2887
2576 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2889 $self->reflow;
2578} 2890}
2579 2891
2580sub visible_children { 2892sub size_request {
2581 my ($self) = @_; 2893 my ($self) = @_;
2582 2894
2583 @{$self->{children}}[0,1] 2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2584} 2899}
2585 2900
2586sub invoke_size_allocate { 2901sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2588 2903
… …
2594 $self->{layout}->set_width ($empty->{w}); 2909 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2911
2597 $self->reflow; 2912 $self->reflow;
2598 2913
2914 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2600} 2926}
2601 2927
2602sub get_layout { 2928sub get_layout {
2603 my ($self, $para) = @_; 2929 my ($self, $para) = @_;
2604 2930
… …
2632 2958
2633 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2635} 2961}
2636 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2637sub clear { 2978sub clear {
2638 my ($self) = @_; 2979 my ($self) = @_;
2639 2980
2640 my (undef, undef, @other) = @{ $self->{children} }; 2981 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 2982 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 2985 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 2987}
2647 2988
2648sub add_paragraph { 2989sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 2990 my $self = shift;
2650 2991
2651 my ($text, @w) = ref $para ? @$para : $para; 2992 for my $para (@_) {
2652
2653 $para = { 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 2999 w => 1e10,
2655 wrapped => 1, 3000 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3001 };
2661 3002
2662 $self->add (@w) if @w; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
2664 3010
2665 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2666 $self->update; 3012 $self->update;
2667} 3013}
2668 3014
2669sub scroll_to_bottom { 3015sub scroll_to_bottom {
2670 my ($self) = @_; 3016 my ($self) = @_;
2671 3017
2672 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3019 $self->update;
2674} 3020}
2675 3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3046
3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
3053}
3054
2676sub update { 3055sub update {
2677 my ($self) = @_; 3056 my ($self) = @_;
2678 3057
2679 $self->SUPER::update; 3058 $self->SUPER::update;
2680 3059
2681 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2682 3061
2683 delete $self->{texture}; 3062 delete $self->{texture};
2684 3063
2685 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3068
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 { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2718 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2720 3082
2721 my $y0 = $top; 3083 my $y0 = $top;
2722 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2723 3085
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}}) { 3086 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2732 3089
2733 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3091 my $layout = $self->get_layout ($para);
2736 3092
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3093 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3094
2742 if (my @w = @{ $para->{widget} }) { 3095 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3096 my @s = $layout->get_shapes;
2744 3097
2745 for (@w) { 3098 for (@w) {
… …
2751 $_->draw; 3104 $_->draw;
2752 } 3105 }
2753 } 3106 }
2754 } 3107 }
2755 3108
2756 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3111 }
2758 3112
2759 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2760 }; 3114 };
2761 }); 3115 });
2762} 3116}
2763 3117
2764sub reconfigure { 3118sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2783} 3137}
2784 3138
2785############################################################################# 3139#############################################################################
2786 3140
2787package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2788 3142
2789use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2790 3144
2791our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2792 3146
2793sub moveto { 3147sub moveto {
2794 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2795 3149
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3178 glPopMatrix;
2825} 3179}
2826 3180
2827############################################################################# 3181#############################################################################
2828 3182
2829package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2830 3184
2831our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2832 3186
2833sub new { 3187sub new {
2834 my $class = shift; 3188 my $class = shift;
2835 3189
2836 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2849} 3203}
2850 3204
2851############################################################################# 3205#############################################################################
2852 3206
2853package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2854 3208
2855our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2856 3210
2857use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2858 3212
2859sub new { 3213sub new {
2860 my $class = shift; 3214 my $class = shift;
2861 3215
2862 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2865 ) 3219 )
2866} 3220}
2867 3221
2868sub set_tooltip_from { 3222sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3227
2871 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2872 3229
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3235 }
2879 3236
2880 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2882 3239
2883 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3241 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3243 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3245 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3247 );
2891} 3248}
2892 3249
… …
2911 3268
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2914 or return; 3271 or return;
2915 3272
3273 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3275
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2920 3278
2921 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2922 }); 3283 });
2923} 3284}
2924 3285
2925sub _draw { 3286sub _draw {
2926 my ($self) = @_; 3287 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2951} 3312}
2952 3313
2953############################################################################# 3314#############################################################################
2954 3315
2955package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2956 3317
2957our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2958 3319
2959use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2960 3321
2961sub new { 3322sub new {
2962 my $class = shift; 3323 my $class = shift;
2963 3324
2964 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2966 can_events => 0, 3327 can_events => 0,
2967 @_, 3328 @_,
2968 ); 3329 );
2969 3330
2970 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2972 3333
2973 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3336 hard => 1,
2976 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2977 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2978 ++$widget->{frame}; 3340 ++$widget->{frame};
2979 $widget->update; 3341 $widget->update;
2980 }, 3342 },
2981 ); 3343 );
2982 } 3344 }
… …
2999sub _draw { 3361sub _draw {
3000 my ($self) = @_; 3362 my ($self) = @_;
3001 3363
3002 return unless $::CONN; 3364 return unless $::CONN;
3003 3365
3366 $self->SUPER::_draw;
3367
3004 my $face; 3368 my $face;
3005 3369
3006 if ($self->{frame}) { 3370 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3008 3372
3009 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim; 3374 if $anim && @$anim;
3011 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3012 3379
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3014 3381
3015 if ($tex) { 3382 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3020 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3021 } 3392 }
3022} 3393}
3023 3394
3024sub destroy { 3395sub destroy {
3025 my ($self) = @_; 3396 my ($self) = @_;
… …
3030 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
3031} 3402}
3032 3403
3033############################################################################# 3404#############################################################################
3034 3405
3035package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
3036 3407
3037our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
3038 3409
3039# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
3040 3411
3041############################################################################# 3412#############################################################################
3042 3413
3043package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
3044 3415
3045our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
3046 3417
3047use CFClient::OpenGL; 3418use CFPlus::OpenGL;
3048 3419
3049sub new { 3420sub new {
3050 my $class = shift; 3421 my $class = shift;
3051 3422
3052 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
3053 items => [], 3424 items => [],
3054 z => 100, 3425 z => 100,
3055 @_, 3426 @_,
3056 ); 3427 );
3057 3428
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3430
3060 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
3062 3433
3063 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
3064 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
3065 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3440 can_hover => 1,
3067 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
3068 markup => $widget, 3453 markup => $widget,
3069 tooltip => $tooltip 3454 tooltip => $tooltip;
3455 }
3070 } 3456 }
3071 3457
3072 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
3073 3459
3074 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
3117 1 3503 1
3118} 3504}
3119 3505
3120############################################################################# 3506#############################################################################
3121 3507
3122package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3123 3509
3124our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3125 3511
3126sub new { 3512sub new {
3127 my $class = shift; 3513 my $class = shift;
3128 3514
3129 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
3143 3529
3144 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3531 if @{ $self->{children} };
3146} 3532}
3147 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3148sub set_current_page { 3540sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
3150 3542
3151 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3544 ? $page_or_widget
… …
3184 $self->{current}->draw; 3576 $self->{current}->draw;
3185} 3577}
3186 3578
3187############################################################################# 3579#############################################################################
3188 3580
3189package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3190 3582
3191our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3192 3584
3193sub new { 3585sub new {
3194 my $class = shift; 3586 my $class = shift;
3195 3587
3196 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3200 @_, 3592 @_,
3201 ); 3593 );
3202 3594
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3599}
3208 3600
3209sub add { 3601sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3211 3603
3212 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3213 3605
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3607 markup => $title,
3216 tooltip => $tooltip, 3608 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3610 );
3219 3611
3220 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3221} 3613}
3222 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3223sub set_current_page { 3621sub set_current_page {
3224 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3225 3623
3226 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3626}
3229 3627
3230############################################################################# 3628#############################################################################
3231 3629
3232package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3233 3631
3234use utf8; 3632use utf8;
3235 3633
3236our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3237 3635
3238sub new { 3636sub new {
3239 my $class = shift; 3637 my $class = shift;
3240 3638
3241 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3259 3657
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3659 }
3262 3660
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3662}
3265 3663
3266sub _set_value { 3664sub _set_value {
3267 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3268 3666
… …
3283 $self->emit (changed => $value); 3681 $self->emit (changed => $value);
3284} 3682}
3285 3683
3286############################################################################# 3684#############################################################################
3287 3685
3288package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3289 3687
3290our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3291 3689
3292sub new { 3690sub new {
3293 my $class = shift; 3691 my $class = shift;
3294 3692
3295 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3694 fontsize => 0.8,
3297 @_, 3695 @_,
3298 ); 3696 );
3299 3697
3300 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3301 3699
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3701
3304 $self 3702 $self
3305} 3703}
… …
3307sub reorder { 3705sub reorder {
3308 my ($self) = @_; 3706 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3310 3708
3311 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3315 3713
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3716 }
… …
3339 for ($short) { 3737 for ($short) {
3340 s/^\s+//; 3738 s/^\s+//;
3341 s/\s+/ /g; 3739 s/\s+/ /g;
3342 } 3740 }
3343 3741
3344 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3345 markup => $short, 3743 markup => $short,
3346 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 3801 count => 1,
3404 %arg, 3802 %arg,
3405 }; 3803 };
3406 } 3804 }
3407 3805
3806 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3807 $self->reorder;
3808 });
3409} 3809}
3410 3810
3411sub reconfigure { 3811sub reconfigure {
3412 my ($self) = @_; 3812 my ($self) = @_;
3413 3813
… …
3426 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3427} 3827}
3428 3828
3429############################################################################# 3829#############################################################################
3430 3830
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; 3831package CFPlus::UI::Root;
3804 3832
3805our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3806 3834
3807use List::Util qw(min max); 3835use List::Util qw(min max);
3808 3836
3809use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3810 3838
3811sub new { 3839sub new {
3812 my $class = shift; 3840 my $class = shift;
3813 3841
3814 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3815 visible => 1, 3843 visible => 1,
3816 @_, 3844 @_,
3817 ); 3845 );
3818 3846
3819 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3820 3848
3821 $self 3849 $self
3822} 3850}
3823 3851
3824sub size_request { 3852sub size_request {
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4019
3992 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3994 4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
3995 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3997 4034
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4036 $widget->{old_w} = $widget->{w};
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4061 glLoadIdentity;
4025 4062
4026 { 4063 {
4027 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
4028 4065
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4068
4033 $self->_draw; 4069 $self->_draw;
4070 }
4034} 4071}
4035 4072
4036############################################################################# 4073#############################################################################
4037 4074
4038package CFClient::UI; 4075package CFPlus::UI;
4039 4076
4040$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4079
40431 40801
4044 4081

Diff Legend

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