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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 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}
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
393 427
394 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
395 429
396 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
397 431
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 435 }
402} 436}
403 437
404# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
405sub coord2local { 439sub coord2local {
406 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
407 441
442 Carp::confess unless $self->{parent};#d#
443
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 445}
410 446
411# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
412sub coord2global { 448sub coord2global {
413 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
414 450
451 Carp::confess unless $self->{parent};#d#
452
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 454}
417 455
418sub invoke_focus_in { 456sub invoke_focus_in {
419 my ($self) = @_; 457 my ($self) = @_;
420 458
421 return if $FOCUS == $self; 459 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
423 461
424 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
425 463
426 $focus->update if $focus; 464 $self->update;
427 $FOCUS->update;
428 465
429 0 466 0
430} 467}
431 468
432sub invoke_focus_out { 469sub invoke_focus_out {
433 my ($self) = @_; 470 my ($self) = @_;
434 471
435 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
436 473
437 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
438 475
439 $focus->update if $focus; #? 476 $self->update;
440 477
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 479 unless $FOCUS;
443 480
444 0 481 0
445} 482}
446 483
447sub grab_focus { 484sub grab_focus {
448 my ($self) = @_; 485 my ($self) = @_;
449 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
451} 489}
452 490
453sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
457 496
458sub invoke_button_down { 497sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
460 499
461 $self->grab_focus; 500 $self->grab_focus;
462 501
463 1 502 0
464} 503}
465 504
466sub connect { 505sub connect {
467 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
468 507
469 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
470} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
471 528
472sub emit { 529sub emit {
473 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
474 531
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 532 # I do not really like this solution, but I do not like duplication
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
476 ($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
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
478} 550}
479 551
480sub find_widget { 552sub find_widget {
481 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
482 554
… …
490} 562}
491 563
492sub set_parent { 564sub set_parent {
493 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
494 566
495 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
497} 569}
498 570
499sub realloc { 571sub realloc {
500 my ($self) = @_; 572 my ($self) = @_;
… …
534 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
535 607
536 # update screen rectangle 608 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 611
542 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 615
… …
568 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
571 glEnd; 641 glEnd;
572 glPopMatrix; 642 glPopMatrix;
573 #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;
574 } 644 }
575 645
576 $self->_draw; 646 $self->_draw;
577 glPopMatrix; 647 glPopMatrix;
578} 648}
… …
581 my ($self) = @_; 651 my ($self) = @_;
582 652
583 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
584} 654}
585 655
656my $cntx;#d#
586sub DESTROY { 657sub DESTROY {
587 my ($self) = @_; 658 my ($self) = @_;
588 659
589 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
590 661
591 eval { $self->destroy }; 662 eval { $self->destroy };
592 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};
593} 666}
594 667
595############################################################################# 668#############################################################################
596 669
597package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
598 671
599our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
600 673
601use strict; 674use strict;
602use CFClient::OpenGL; 675use CFPlus::OpenGL;
603 676
604sub new { 677sub new {
605 my $class = shift; 678 my $class = shift;
606 679
607 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
638 } 711 }
639} 712}
640 713
641############################################################################# 714#############################################################################
642 715
643package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
644 717
645our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
646 719
647sub new { 720sub new {
648 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
649 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
650} 723}
… …
657 730
658sub draw { } 731sub draw { }
659 732
660############################################################################# 733#############################################################################
661 734
662package CFClient::UI::Container; 735package CFPlus::UI::Container;
663 736
664our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
665 738
666sub new { 739sub new {
667 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
668 741
669 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
678 if $children; 751 if $children;
679 752
680 $self 753 $self
681} 754}
682 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
683sub add { 764sub add {
684 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
685 766
686 $_->set_parent ($self) 767 $_->set_parent ($self)
687 for @widgets; 768 for @widgets;
… …
747 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
748} 829}
749 830
750############################################################################# 831#############################################################################
751 832
752package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
753 834
754our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
755 836
756sub new { 837sub new {
757 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
758 839
759 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760 841
761 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
762} 843}
763 844
764sub add { 845sub add {
… …
771sub remove { 852sub remove {
772 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
773 854
774 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
775 856
776 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
777 unless @{$self->{children}}; 858 unless @{$self->{children}};
778} 859}
779 860
780sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
781 862
… …
793 874
794############################################################################# 875#############################################################################
795 876
796# back-buffered drawing area 877# back-buffered drawing area
797 878
798package CFClient::UI::Window; 879package CFPlus::UI::Window;
799 880
800our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
801 882
802use CFClient::OpenGL; 883use CFPlus::OpenGL;
803 884
804sub new { 885sub new {
805 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
806 887
807 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
829} 910}
830 911
831sub render_child { 912sub render_child {
832 my ($self) = @_; 913 my ($self) = @_;
833 914
834 $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 {
835 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
837 918
838 { 919 {
839 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
840 921
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
843 } 926 }
844
845 $self->_render;
846 }; 927 };
847} 928}
848 929
849sub _draw { 930sub _draw {
850 my ($self) = @_; 931 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 932
854 my $tex = $self->{texture} 933 my $tex = $self->{texture}
855 or return; 934 or return;
856 935
857 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
860 939
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
862 941
863 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
864} 943}
865 944
866############################################################################# 945#############################################################################
867 946
868package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
869 948
870our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
871 950
872sub new { 951sub new {
873 my $class = shift; 952 my $class = shift;
874 953
875 $class->SUPER::new ( 954 $class->SUPER::new (
… …
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 1016 ) {
938 $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})
939 } else { 1018 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 1020 }
942} 1021}
943 1022
944sub _render { 1023sub _render {
945 my ($self) = @_; 1024 my ($self) = @_;
946 1025
947 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};
948 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};
949 1028
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 1030
952 $self->SUPER::_render; 1031 $self->SUPER::_render;
953} 1032}
954 1033
955############################################################################# 1034#############################################################################
956 1035
957package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
958 1037
959our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::HBox::;
960 1039
961sub new { 1040sub new {
962 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
963 1042
964 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
965 1044
966 my $self; 1045 my $self;
967 1046
968 my $slider = new CFClient::UI::Slider 1047 my $slider = new CFPlus::UI::Slider
969 vertical => 1, 1048 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1050 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1051 $self->{vp}->set_offset (0, $_[1]);
973 }, 1052 },
974 ; 1053 ;
975 1054
976 $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1,
978 slider => $slider, 1058 slider => $slider,
979 %arg, 1059 %arg,
980 ); 1060 );
981 1061
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child; 1063 $self->add ($child) if $child;
984 1064
985 $self 1065 $self
986} 1066}
987 1067
1068#TODO# update range on size_allocate depending on child
1069
988sub add { 1070sub add {
989 my ($self, $widget) = @_; 1071 my ($self, $widget) = @_;
990 1072
991 $self->{vp}->add ($self->{child} = $widget); 1073 $self->{vp}->add ($self->{child} = $widget);
992} 1074}
993 1075
1076sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_;
1078
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev);
1082
1083 1
1084}
1085
1086sub update_slider {
1087 my ($self) = @_;
1088
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1090}
1091
994sub update { 1092sub update {
995 my ($self) = @_; 1093 my ($self) = @_;
996 1094
997 $self->SUPER::update; 1095 $self->SUPER::update;
998 1096
999 # todo: overwrite size_allocate of child 1097 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1098}
1003 1099
1004sub invoke_size_allocate { 1100sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1101 my ($self, $w, $h) = @_;
1006 1102
1007 my $child = $self->{vp}->child; 1103 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1104
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1105 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1106}
1012 1107
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1108#############################################################################
1017 1109
1018package CFClient::UI::Frame; 1110package CFPlus::UI::Frame;
1019 1111
1020our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
1021 1113
1022use CFClient::OpenGL; 1114use CFPlus::OpenGL;
1023 1115
1024sub new { 1116sub new {
1025 my $class = shift; 1117 my $class = shift;
1026 1118
1027 $class->SUPER::new ( 1119 $class->SUPER::new (
… …
1053 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
1054} 1146}
1055 1147
1056############################################################################# 1148#############################################################################
1057 1149
1058package CFClient::UI::FancyFrame; 1150package CFPlus::UI::FancyFrame;
1059 1151
1060our @ISA = CFClient::UI::Bin::; 1152our @ISA = CFPlus::UI::Bin::;
1061 1153
1062use CFClient::OpenGL; 1154use CFPlus::OpenGL;
1155
1156sub new {
1157 my ($class, %arg) = @_;
1158
1159 if ((exists $arg{label}) && !ref $arg{label}) {
1160 $arg{label} = new CFPlus::UI::Label
1161 align => 1,
1162 valign => 0,
1163 text => $arg{label},
1164 fontsize => ($arg{border} || 0.8) * 0.75;
1165 }
1166
1167 my $self = $class->SUPER::new (
1168 # label => "",
1169 fg => [0.6, 0.3, 0.1],
1170 border => 0.8,
1171 style => 'single',
1172 %arg,
1173 );
1174
1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1183}
1184
1185sub border {
1186 int $_[0]{border} * $::FONTSIZE
1187}
1188
1189sub size_request {
1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
1194
1195 my ($w, $h) = $self->SUPER::size_request;
1196
1197 (
1198 $w + $self->border * 2,
1199 $h + $self->border * 2,
1200 )
1201}
1202
1203sub invoke_size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 my $border = $self->border;
1207
1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
1210
1211 if (my $label = $self->{label}) {
1212 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1213 $label->{h} = List::Util::min $h, $border;
1214 $label->invoke_size_allocate ($label->{w}, $label->{h});
1215 }
1216
1217 $self->child->configure ($border, $border, $w, $h);
1218
1219 1
1220}
1221
1222sub _draw {
1223 my ($self) = @_;
1224
1225 my $child = $self->{children}[0];
1226
1227 my $border = $self->border;
1228 my ($w, $h) = ($self->{w}, $self->{h});
1229
1230 $child->draw;
1231
1232 glColor @{$self->{fg}};
1233 glBegin GL_LINE_STRIP;
1234 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1235 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1236 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1237 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1238 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1239 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1240 glEnd;
1241
1242 if ($self->{label}) {
1243 glTranslate $border * 2, 0;
1244 $self->{label}->_draw;
1245 }
1246}
1247
1248#############################################################################
1249
1250package CFPlus::UI::Toplevel;
1251
1252our @ISA = CFPlus::UI::Bin::;
1253
1254use CFPlus::OpenGL;
1063 1255
1064my $bg = 1256my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1257 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1258 mipmap => 1, wrap => 1;
1067 1259
1068my @border = 1260my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1263
1072sub new { 1264sub new {
1073 my ($class, %arg) = @_; 1265 my ($class, %arg) = @_;
1074 1266
1075 my $self = $class->SUPER::new ( 1267 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1268 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1269 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1270 border => 0.6,
1079 can_events => 1, 1271 can_events => 1,
1080 min_w => 16, 1272 min_w => 64,
1081 min_h => 16, 1273 min_h => 32,
1082 %arg, 1274 %arg,
1083 ); 1275 );
1084 1276
1085 $self->{title_widget} = new CFClient::UI::Label 1277 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1278 align => 0,
1087 valign => 1, 1279 valign => 1,
1088 text => $self->{title}, 1280 text => $self->{title},
1089 fontsize => $self->{border}, 1281 fontsize => $self->{border},
1090 if exists $self->{title}; 1282 if exists $self->{title};
1091 1283
1092 if ($self->{has_close_button}) { 1284 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1285 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1286 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1287 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1288 on_activate => sub { $self->emit ("delete") };
1097 1289
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1290 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1291 }
1100 1292
1101 $self 1293 $self
1102} 1294}
1103 1295
1104sub add { 1296sub add {
1105 my ($self, @widgets) = @_; 1297 my ($self, @widgets) = @_;
1106 1298
1107 $self->SUPER::add (@widgets); 1299 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1300 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1301 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110} 1302}
1111 1303
1112sub border { 1304sub border {
1113 int $_[0]{border} * $::FONTSIZE 1305 int $_[0]{border} * $::FONTSIZE
1114} 1306}
… …
1147 $self->child->configure ($border, $border, $w, $h); 1339 $self->child->configure ($border, $border, $w, $h);
1148 1340
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1341 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1342 if $self->{close_button};
1151 1343
1344 1
1345}
1346
1347sub invoke_delete {
1348 my ($self) = @_;
1349
1350 $self->hide;
1351
1152 1 1352 1
1153} 1353}
1154 1354
1155sub invoke_button_down { 1355sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1414 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1415
1216 ! ! $self->{motion} 1416 ! ! $self->{motion}
1217} 1417}
1218 1418
1419sub invoke_visibility_change {
1420 my ($self, $visible) = @_;
1421
1422 delete $self->{motion} unless $visible;
1423
1424 0
1425}
1426
1219sub _draw { 1427sub _draw {
1220 my ($self) = @_; 1428 my ($self) = @_;
1221 1429
1222 my $child = $self->{children}[0]; 1430 my $child = $self->{children}[0];
1223 1431
… …
1260 if $self->{close_button}; 1468 if $self->{close_button};
1261} 1469}
1262 1470
1263############################################################################# 1471#############################################################################
1264 1472
1265package CFClient::UI::Table; 1473package CFPlus::UI::Table;
1266 1474
1267our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
1268 1476
1269use List::Util qw(max sum); 1477use List::Util qw(max sum);
1270 1478
1271use CFClient::OpenGL; 1479use CFPlus::OpenGL;
1272 1480
1273sub new { 1481sub new {
1274 my $class = shift; 1482 my $class = shift;
1275 1483
1276 $class->SUPER::new ( 1484 $class->SUPER::new (
… …
1282sub children { 1490sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284} 1492}
1285 1493
1286sub add { 1494sub add {
1287 my ($self, $x, $y, $child) = @_; 1495 my ($self) = shift;
1288 1496
1497 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, ();
1289 $child->set_parent ($self); 1499 $child->set_parent ($self);
1290 $self->{children}[$y][$x] = $child; 1500 $self->{children}[$y][$x] = $child;
1501 }
1291 1502
1503 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1;
1292 $self->realloc; 1505 $self->realloc;
1293} 1506}
1294 1507
1295sub remove { 1508sub remove {
1296 my ($self, $child) = @_; 1509 my ($self, $child) = @_;
… …
1361 1574
1362 # linearly scale sizes 1575 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1578
1366 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1367 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1368 1581
1369 my $y; 1582 my $y;
1370 1583
1371 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1372 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1415 } 1628 }
1416} 1629}
1417 1630
1418############################################################################# 1631#############################################################################
1419 1632
1420package CFClient::UI::Box; 1633package CFPlus::UI::Box;
1421 1634
1422our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1423 1636
1424sub size_request { 1637sub size_request {
1425 my ($self) = @_; 1638 my ($self) = @_;
1426 1639
1427 $self->{vertical} 1640 $self->{vertical}
… …
1437 1650
1438sub invoke_size_allocate { 1651sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1440 1653
1441 my $space = $self->{vertical} ? $h : $w; 1654 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1655 my @children = $self->visible_children;
1443 1656
1444 my @req; 1657 my @req;
1445 1658
1446 if ($self->{homogeneous}) { 1659 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1660 @req = ($space / (@children || 1)) x @children;
1448 } else { 1661 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1662 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1663 my $req = List::Util::sum @req;
1451 1664
1452 if ($req > $space) { 1665 if ($req > $space) {
1453 # ah well, not enough space 1666 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1667 $_ *= $space / $req for @req;
1455 } else { 1668 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1669 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1670
1458 $space = ($space - $req) / $expand; # remaining space to give away 1671 $space = ($space - $req) / $expand; # remaining space to give away
1459 1672
1460 $req[$_] += $space * $children->[$_]{expand} 1673 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1674 for 0 .. $#children;
1462 } 1675 }
1463 } 1676 }
1464 1677
1465 CFClient::UI::harmonize \@req; 1678 CFPlus::UI::harmonize \@req;
1466 1679
1467 my $pos = 0; 1680 my $pos = 0;
1468 for (0 .. $#$children) { 1681 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1682 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1683 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1684
1472 $pos += $alloc; 1685 $pos += $alloc;
1473 } 1686 }
1474 1687
1475 1 1688 1
1476} 1689}
1477 1690
1478############################################################################# 1691#############################################################################
1479 1692
1480package CFClient::UI::HBox; 1693package CFPlus::UI::HBox;
1481 1694
1482our @ISA = CFClient::UI::Box::; 1695our @ISA = CFPlus::UI::Box::;
1483 1696
1484sub new { 1697sub new {
1485 my $class = shift; 1698 my $class = shift;
1486 1699
1487 $class->SUPER::new ( 1700 $class->SUPER::new (
… …
1490 ) 1703 )
1491} 1704}
1492 1705
1493############################################################################# 1706#############################################################################
1494 1707
1495package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1496 1709
1497our @ISA = CFClient::UI::Box::; 1710our @ISA = CFPlus::UI::Box::;
1498 1711
1499sub new { 1712sub new {
1500 my $class = shift; 1713 my $class = shift;
1501 1714
1502 $class->SUPER::new ( 1715 $class->SUPER::new (
… …
1505 ) 1718 )
1506} 1719}
1507 1720
1508############################################################################# 1721#############################################################################
1509 1722
1510package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1511 1724
1512our @ISA = CFClient::UI::DrawBG::; 1725our @ISA = CFPlus::UI::DrawBG::;
1513 1726
1514use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1515 1728
1516sub new { 1729sub new {
1517 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1518 1731
1519 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1735 #active_bg => none
1523 #font => default_font 1736 #font => default_font
1524 #text => initial text 1737 #text => initial text
1525 #markup => initial narkup 1738 #markup => initial narkup
1526 #max_w => maximum pixel width 1739 #max_w => maximum pixel width
1740 #style => 0, # render flags
1527 ellipsise => 3, # end 1741 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1742 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1743 fontsize => 1,
1530 align => -1, 1744 align => -1,
1531 valign => -1, 1745 valign => -1,
1532 padding_x => 2, 1746 padding_x => 2,
1533 padding_y => 2, 1747 padding_y => 2,
1534 can_events => 0, 1748 can_events => 0,
1535 %arg 1749 %arg
1536 ); 1750 );
1537 1751
1538 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1755 $self->{template} = $layout;
1542 } 1756 }
1543 1757
1544 if (exists $self->{markup}) { 1758 if (exists $self->{markup}) {
… …
1548 } 1762 }
1549 1763
1550 $self 1764 $self
1551} 1765}
1552 1766
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1767sub update {
1564 my ($self) = @_; 1768 my ($self) = @_;
1565 1769
1566 delete $self->{texture}; 1770 delete $self->{texture};
1567 $self->SUPER::update; 1771 $self->SUPER::update;
… …
1578 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1579 1783
1580 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1582 1786
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1585 1788
1586 delete $self->{size_req}; 1789 delete $self->{size_req};
1587 $self->realloc; 1790 $self->realloc;
1588 $self->update; 1791 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1596 1799
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1801
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1601 1803
1602 delete $self->{size_req}; 1804 delete $self->{size_req};
1603 $self->realloc; 1805 $self->realloc;
1604 $self->update; 1806 $self->update;
… …
1616 1818
1617 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1618 1820
1619 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1822 $self->{template}->set_font ($self->{font}) if $self->{font};
1823 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1825
1623 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1624 1827
1625 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
… …
1630 }; 1833 };
1631 1834
1632 @{ $self->{size_req} } 1835 @{ $self->{size_req} }
1633} 1836}
1634 1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1635sub invoke_size_allocate { 1842sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1637 1844
1638 delete $self->{ox}; 1845 delete $self->{ox};
1639 1846
… …
1645 1852
1646sub set_fontsize { 1853sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1648 1855
1649 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1650 delete $self->{texture}; 1858 delete $self->{texture};
1651 1859
1652 $self->realloc; 1860 $self->realloc;
1653} 1861}
1654 1862
1655sub reconfigure { 1863sub reconfigure {
1656 my ($self) = @_; 1864 my ($self) = @_;
1657 1865
1658 delete $self->{size_req}; 1866 delete $self->{size_req};
1867 delete $self->{texture};
1659 1868
1660 $self->SUPER::reconfigure; 1869 $self->SUPER::reconfigure;
1661} 1870}
1662 1871
1663sub _draw { 1872sub _draw {
1664 my ($self) = @_; 1873 my ($self) = @_;
1665 1874
1666 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1667 1876
1668 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1884
1676 new_from_layout CFClient::Texture $self->{layout} 1885 [$self->{layout}->size]
1677 }; 1886 };
1678 1887
1679 unless (exists $self->{ox}) { 1888 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1891 : ($self->{w} - $size->[0]) * 0.5);
1683 1892
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1895 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1896 };
1688 1897
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1900
1694 if ($tex->{format} == GL_ALPHA) { 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 }
1702
1703 glDisable GL_TEXTURE_2D;
1704} 1902}
1705 1903
1706############################################################################# 1904#############################################################################
1707 1905
1708package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1709 1907
1710our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1711 1909
1712use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1713 1911
1714sub new { 1912sub new {
1715 my $class = shift; 1913 my $class = shift;
1716 1914
1717 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1721 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1722 can_hover => 1, 1920 can_hover => 1,
1723 can_focus => 1, 1921 can_focus => 1,
1724 valign => 0, 1922 valign => 0,
1725 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1726 #text => ... 1925 #text => ...
1727 #hidden => "*", 1926 #hidden => "*",
1728 @_ 1927 @_
1729 ) 1928 )
1730} 1929}
… …
1775 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1776 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1777 1976
1778 my $text = $self->get_text; 1977 my $text = $self->get_text;
1779 1978
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1980
1780 if ($uni == 8) { 1981 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 1989 } elsif ($sym == CFPlus::SDLK_HOME) {
1990 # what a hack
1991 $self->{cursor} =
1992 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1993 ? length $1
1994 : 0;
1995 } elsif ($sym == CFPlus::SDLK_END) {
1996 # uh, again
1997 $self->{cursor} =
1998 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1999 ? $self->{cursor} + length $1
2000 : length $self->{text};
2001 } elsif ($uni == 21) { # ctrl-u
2002 $text = "";
1789 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) {
1791 $self->{cursor} = length $text;
1792 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 2005 $self->emit ('escape');
1794 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 2010 } else {
1797 return 0; 2011 return 0;
1798 } 2012 }
1799 2013
1800 $self->_set_text ($text); 2014 $self->_set_text ($text);
1801 2015
1802 $self->realloc; 2016 $self->realloc;
2017 $self->update;
1803 2018
1804 1 2019 1
1805} 2020}
1806 2021
1807sub invoke_focus_in { 2022sub invoke_focus_in {
… …
1819 2034
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2036
1822 # byte-index to char-index 2037 # byte-index to char-index
1823 my $text = $self->{text}; 2038 my $text = $self->{text};
1824 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1826 2041
1827 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1828 $self->update; 2043 $self->update;
1829 2044
1830 1 2045 1
… …
1869 utf8::encode $text; 2084 utf8::encode $text;
1870 2085
1871 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2086 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872 } 2087 }
1873 2088
1874 glColor @{$self->{fg}};
1875 glBegin GL_LINES; 2089 glBegin GL_LINES;
1876 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2090 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2091 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878 glEnd; 2092 glEnd;
1879 } 2093 }
1880} 2094}
1881 2095
2096#############################################################################
2097
1882package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1883 2099
1884our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1885 2101
1886use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1887 2103
1888sub invoke_key_down { 2104sub invoke_key_down {
1889 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1890 2106
1891 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1892 2108
1893 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1896 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 2115 $self->emit (activate => $txt);
1899 $self->update; 2116 $self->update;
1900 2117
1901 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1902 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1903 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1904 } 2121 }
1905 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1906 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1908 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1909 } 2126 }
1910 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1911 } 2128 }
1912 2129
1913 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1914 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1915 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916 2133
1917 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1927 1 2144 1
1928} 2145}
1929 2146
1930############################################################################# 2147#############################################################################
1931 2148
2149package CFPlus::UI::TextEdit;
2150
2151our @ISA = CFPlus::UI::EntryBase::;
2152
2153use CFPlus::OpenGL;
2154
2155sub move_cursor_ver {
2156 my ($self, $dy) = @_;
2157
2158 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2159
2160 $y += $dy;
2161
2162 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2163 $self->{cursor} = $index;
2164 delete $self->{cur_h};
2165 $self->update;
2166 return;
2167 }
2168}
2169
2170sub invoke_key_down {
2171 my ($self, $ev) = @_;
2172
2173 my $sym = $ev->{sym};
2174
2175 if ($sym == CFPlus::SDLK_UP) {
2176 $self->move_cursor_ver (-1);
2177 } elsif ($sym == CFPlus::SDLK_DOWN) {
2178 $self->move_cursor_ver (+1);
2179 } else {
2180 return $self->SUPER::invoke_key_down ($ev)
2181 }
2182
2183 1
2184}
2185
2186#############################################################################
2187
1932package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1933 2189
1934our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1935 2191
1936use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1937 2193
1938my @tex = 2194my @tex =
1939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1941 2197
1942sub new { 2198sub new {
1943 my $class = shift; 2199 my $class = shift;
1944 2200
… …
1981 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1982} 2238}
1983 2239
1984############################################################################# 2240#############################################################################
1985 2241
2242package CFPlus::UI::CheckBox;
2243
2244our @ISA = CFPlus::UI::DrawBG::;
2245
2246my @tex =
2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2249
2250use CFPlus::OpenGL;
2251
2252sub new {
2253 my $class = shift;
2254
2255 $class->SUPER::new (
2256 padding_x => 2,
2257 padding_y => 2,
2258 fg => [1, 1, 1],
2259 active_fg => [1, 1, 0],
2260 bg => [0, 0, 0, 0.2],
2261 active_bg => [1, 1, 1, 0.5],
2262 state => 0,
2263 can_hover => 1,
2264 @_
2265 )
2266}
2267
2268sub size_request {
2269 my ($self) = @_;
2270
2271 (6) x 2
2272}
2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
2282sub invoke_button_down {
2283 my ($self, $ev, $x, $y) = @_;
2284
2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2287 $self->toggle;
2288 } else {
2289 return 0
2290 }
2291
2292 1
2293}
2294
2295sub _draw {
2296 my ($self) = @_;
2297
2298 $self->SUPER::_draw;
2299
2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2301
2302 my ($w, $h) = @$self{qw(w h)};
2303
2304 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2305
2306 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2307
2308 my $tex = $self->{state} ? $tex[1] : $tex[0];
2309
2310 glEnable GL_TEXTURE_2D;
2311 $tex->draw_quad_alpha (0, 0, $s, $s);
2312 glDisable GL_TEXTURE_2D;
2313}
2314
2315#############################################################################
2316
2317package CFPlus::UI::Image;
2318
2319our @ISA = CFPlus::UI::Base::;
2320
2321use CFPlus::OpenGL;
2322
2323our %texture_cache;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
2332
2333 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required";
2335
2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2337 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2338
2339 CFPlus::weaken $texture_cache{$self->{path}};
2340
2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2342
2343 $self
2344}
2345
2346sub STORABLE_freeze {
2347 my ($self, $cloning) = @_;
2348
2349 $self->{path}
2350 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2351
2352 $self->{path}
2353}
2354
2355sub STORABLE_attach {
2356 my ($self, $cloning, $path) = @_;
2357
2358 $self->new (path => $path)
2359}
2360
2361sub size_request {
2362 my ($self) = @_;
2363
2364 ($self->{tex}{w}, $self->{tex}{h})
2365}
2366
2367sub _draw {
2368 my ($self) = @_;
2369
2370 my $tex = $self->{tex};
2371
2372 my ($w, $h) = ($self->{w}, $self->{h});
2373
2374 if ($self->{rot90}) {
2375 glRotate 90, 0, 0, 1;
2376 glTranslate 0, -$self->{w}, 0;
2377
2378 ($w, $h) = ($h, $w);
2379 }
2380
2381 glEnable GL_TEXTURE_2D;
2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2383
2384 $tex->draw_quad (0, 0, $w, $h);
2385
2386 glDisable GL_TEXTURE_2D;
2387}
2388
2389#############################################################################
2390
1986package CFClient::UI::ImageButton; 2391package CFPlus::UI::ImageButton;
1987 2392
1988our @ISA = CFClient::UI::Image::; 2393our @ISA = CFPlus::UI::Image::;
1989 2394
1990use CFClient::OpenGL; 2395use CFPlus::OpenGL;
1991 2396
1992my %textures; 2397my %textures;
1993 2398
1994sub new { 2399sub new {
1995 my $class = shift; 2400 my $class = shift;
… …
2017 1 2422 1
2018} 2423}
2019 2424
2020############################################################################# 2425#############################################################################
2021 2426
2022package CFClient::UI::CheckBox;
2023
2024our @ISA = CFClient::UI::DrawBG::;
2025
2026my @tex =
2027 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030use CFClient::OpenGL;
2031
2032sub new {
2033 my $class = shift;
2034
2035 $class->SUPER::new (
2036 padding_x => 2,
2037 padding_y => 2,
2038 fg => [1, 1, 1],
2039 active_fg => [1, 1, 0],
2040 bg => [0, 0, 0, 0.2],
2041 active_bg => [1, 1, 1, 0.5],
2042 state => 0,
2043 can_hover => 1,
2044 @_
2045 )
2046}
2047
2048sub size_request {
2049 my ($self) = @_;
2050
2051 (6) x 2
2052}
2053
2054sub invoke_button_down {
2055 my ($self, $ev, $x, $y) = @_;
2056
2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059 $self->{state} = !$self->{state};
2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
2065 1
2066}
2067
2068sub _draw {
2069 my ($self) = @_;
2070
2071 $self->SUPER::_draw;
2072
2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075 my ($w, $h) = @$self{qw(w h)};
2076
2077 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083 glEnable GL_TEXTURE_2D;
2084 $tex->draw_quad_alpha (0, 0, $s, $s);
2085 glDisable GL_TEXTURE_2D;
2086}
2087
2088#############################################################################
2089
2090package CFClient::UI::Image; 2427package CFPlus::UI::VGauge;
2091 2428
2092our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
2093
2094use CFClient::OpenGL;
2095use Carp qw/confess/;
2096
2097our %loaded_images;
2098
2099sub new {
2100 my $class = shift;
2101
2102 my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106 $loaded_images{$self->{image}} ||=
2107 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111 Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114
2115 $self
2116}
2117
2118sub size_request {
2119 my ($self) = @_;
2120
2121 ($self->{tex}->{w}, $self->{tex}->{h})
2122}
2123
2124sub _draw {
2125 my ($self) = @_;
2126
2127 my $tex = $self->{tex};
2128
2129 my ($w, $h) = ($self->{w}, $self->{h});
2130
2131 if ($self->{rot90}) {
2132 glRotate 90, 0, 0, 1;
2133 glTranslate 0, -$self->{w}, 0;
2134
2135 ($w, $h) = ($h, $w);
2136 }
2137
2138 glEnable GL_TEXTURE_2D;
2139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141 $tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143 glDisable GL_TEXTURE_2D;
2144}
2145
2146#############################################################################
2147
2148package CFClient::UI::VGauge;
2149
2150our @ISA = CFClient::UI::Base::;
2151 2430
2152use List::Util qw(min max); 2431use List::Util qw(min max);
2153 2432
2154use CFClient::OpenGL; 2433use CFPlus::OpenGL;
2155 2434
2156my %tex = ( 2435my %tex = (
2157 food => [ 2436 food => [
2158 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160 ], 2439 ],
2161 grace => [ 2440 grace => [
2162 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2442 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164 ], 2443 ],
2165 hp => [ 2444 hp => [
2166 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168 ], 2447 ],
2169 mana => [ 2448 mana => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2450 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172 ], 2451 ],
2173); 2452);
2174 2453
2175# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2235 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
2236 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
2237 2516
2238 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
2239 my $h2 = $self->{h} * (1 - $ycut2); 2518 my $h2 = $self->{h} * (1 - $ycut2);
2519 my $h3 = $self->{h};
2520
2521 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240 2522
2241 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
… …
2263 2545
2264 if ($t3) { 2546 if ($t3) {
2265 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
2266 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
2267 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271 glEnd; 2553 glEnd;
2272 } 2554 }
2273 2555
2274 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
2275 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2276} 2558}
2277 2559
2278############################################################################# 2560#############################################################################
2279 2561
2280package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
2281 2563
2282our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
2283 2565
2284sub new { 2566sub new {
2285 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
2286 2568
2287 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
2289 can_hover => 1, 2571 can_hover => 1,
2290 can_events => 1, 2572 can_events => 1,
2291 %arg, 2573 %arg,
2292 ); 2574 );
2293 2575
2294 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2576 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2577 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2578 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297 2579
2298 $self 2580 $self
2299} 2581}
2300 2582
2301sub set_fontsize { 2583sub set_fontsize {
… …
2322 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2323} 2605}
2324 2606
2325############################################################################# 2607#############################################################################
2326 2608
2327package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2328 2610
2329use strict; 2611use strict;
2330 2612
2331use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2332 2614
2333our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2334 2616
2335my @tex = 2617my @tex =
2336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2338 2620
2339sub new { 2621sub new {
2340 my $class = shift; 2622 my $class = shift;
2341 2623
… …
2409 2691
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2692 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2693
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2695
2414 $self->mouse_motion ($ev, $x, $y) 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2697}
2416 2698
2417sub invoke_mouse_motion { 2699sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2419 2701
… …
2428 } else { 2710 } else {
2429 return 0; 2711 return 0;
2430 } 2712 }
2431 2713
2432 1 2714 1
2715}
2716
2717sub invoke_mouse_wheel {
2718 my ($self, $ev) = @_;
2719
2720 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2721
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725
2726 ! ! $delta
2433} 2727}
2434 2728
2435sub update { 2729sub update {
2436 my ($self) = @_; 2730 my ($self) = @_;
2437 2731
… …
2486 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2487} 2781}
2488 2782
2489############################################################################# 2783#############################################################################
2490 2784
2491package CFClient::UI::ValSlider; 2785package CFPlus::UI::ValSlider;
2492 2786
2493our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2494 2788
2495sub new { 2789sub new {
2496 my ($class, %arg) = @_; 2790 my ($class, %arg) = @_;
2497 2791
2498 my $range = delete $arg{range}; 2792 my $range = delete $arg{range};
2499 2793
2500 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
2501 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503 to_value => sub { shift }, 2797 to_value => sub { shift },
2504 from_value => sub { shift }, 2798 from_value => sub { shift },
2505 %arg, 2799 %arg,
2506 ); 2800 );
2507 2801
… …
2527sub set_range { shift->{slider}->set_range (@_) } 2821sub set_range { shift->{slider}->set_range (@_) }
2528sub set_value { shift->{slider}->set_value (@_) } 2822sub set_value { shift->{slider}->set_value (@_) }
2529 2823
2530############################################################################# 2824#############################################################################
2531 2825
2532package CFClient::UI::TextScroller; 2826package CFPlus::UI::TextScroller;
2533 2827
2534our @ISA = CFClient::UI::HBox::; 2828our @ISA = CFPlus::UI::HBox::;
2535 2829
2536use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2537 2831
2538sub new { 2832sub new {
2539 my $class = shift; 2833 my $class = shift;
2540 2834
2541 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2542 fontsize => 1, 2836 fontsize => 1,
2543 can_events => 0, 2837 can_events => 1,
2544 indent => 0, 2838 indent => 0,
2545 #font => default_font 2839 #font => default_font
2546 @_, 2840 @_,
2547 2841
2548 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2549 par => [], 2843 par => [],
2844 max_par => 0,
2550 height => 0, 2845 height => 0,
2551 children => [ 2846 children => [
2552 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2553 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2554 ], 2849 ],
2555 ); 2850 );
2556 2851
2557 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2558 2853
… …
2564 2859
2565 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2566 $self->reflow; 2861 $self->reflow;
2567} 2862}
2568 2863
2864sub size_request {
2865 my ($self) = @_;
2866
2867 my ($empty, $slider) = @{ $self->{children} };
2868
2869 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request
2871}
2872
2569sub invoke_size_allocate { 2873sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2874 my ($self, $w, $h) = @_;
2571 2875
2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2878
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 2881 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 2883
2577 $self->reflow; 2884 $self->reflow;
2578 2885
2886 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 2887 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 2888}
2581 2889
2582sub text_size { 2890sub invoke_mouse_wheel {
2583 my ($self, $text, $indent) = @_; 2891 my ($self, $ev) = @_;
2892
2893 return 0 unless $ev->{dy}; # only vertical movements
2894
2895 $self->{children}[1]->emit (mouse_wheel => $ev);
2896
2897 1
2898}
2899
2900sub get_layout {
2901 my ($self, $para) = @_;
2584 2902
2585 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2586 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text); 2910 $layout->set_markup ($para->{markup});
2911
2912 $layout->set_shapes (
2913 map
2914 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2915 @{$para->{widget}}
2591 2916 );
2917
2592 $layout->size 2918 $layout
2593} 2919}
2594 2920
2595sub reflow { 2921sub reflow {
2596 my ($self) = @_; 2922 my ($self) = @_;
2597 2923
… …
2604 2930
2605 # todo: base offset on lines or so, not on pixels 2931 # todo: base offset on lines or so, not on pixels
2606 $self->{children}[1]->set_value ($offset); 2932 $self->{children}[1]->set_value ($offset);
2607} 2933}
2608 2934
2935sub current_paragraph {
2936 my ($self) = @_;
2937
2938 $self->{top_paragraph} - 1
2939}
2940
2941sub scroll_to {
2942 my ($self, $para) = @_;
2943
2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2945
2946 $self->{scroll_to} = $para;
2947 $self->update;
2948}
2949
2609sub clear { 2950sub clear {
2610 my ($self) = @_; 2951 my ($self) = @_;
2952
2953 my (undef, undef, @other) = @{ $self->{children} };
2954 $self->remove ($_) for @other;
2611 2955
2612 $self->{par} = []; 2956 $self->{par} = [];
2613 $self->{height} = 0; 2957 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 2959}
2616 2960
2617sub add_paragraph { 2961sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 2962 my $self = shift;
2619 2963
2620 for my $line (split /\n/, $text) { 2964 for my $para (@_) {
2621 my ($w, $h) = $self->text_size ($line); 2965 $para = {
2966 fg => [1, 1, 1, 1],
2967 indent => 0,
2968 markup => "",
2969 widget => [],
2970 ref $para ? %$para : (markup => $para),
2971 w => 1e10,
2972 wrapped => 1,
2973 };
2974
2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2976 push @{$self->{par}}, $para;
2977 }
2978
2979 if (my $max = $self->{max_par}) {
2980 shift @{$self->{par}} while @{$self->{par}} > $max;
2981 }
2982
2983 $self->{need_reflow}++;
2984 $self->update;
2985}
2986
2987sub scroll_to_bottom {
2988 my ($self) = @_;
2989
2990 $self->{scroll_to} = $#{$self->{par}};
2991 $self->update;
2992}
2993
2994sub force_uptodate {
2995 my ($self) = @_;
2996
2997 if (delete $self->{need_reflow}) {
2998 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2999
3000 my $height = 0;
3001
3002 for my $para (@{$self->{par}}) {
3003 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3004 my $layout = $self->get_layout ($para);
3005 my ($w, $h) = $layout->size;
3006
3007 $para->{w} = $w + $para->{indent};
3008 $para->{h} = $h;
3009 $para->{wrapped} = $layout->has_wrapped;
3010 }
3011
3012 $para->{y} = $height;
3013 $height += $para->{h};
3014 }
3015
2622 $self->{height} += $h; 3016 $self->{height} = $height;
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624 }
2625 3018
2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3019 delete $self->{texture};
3020 }
3021
3022 if (my $paridx = delete $self->{scroll_to}) {
3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
2627} 3025}
2628 3026
2629sub update { 3027sub update {
2630 my ($self) = @_; 3028 my ($self) = @_;
2631 3029
… …
2634 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2635 3033
2636 delete $self->{texture}; 3034 delete $self->{texture};
2637 3035
2638 $ROOT->on_post_alloc ($self => sub { 3036 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate;
3038
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 3040
2641 if (delete $self->{need_reflow}) {
2642 my $height = 0;
2643
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652 $layout->set_markup ($_->[4]);
2653 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3];
2655 $_->[1] = $h;
2656 }
2657
2658 $height += $_->[1];
2659 }
2660
2661 $self->{height} = $height;
2662
2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665 delete $self->{texture};
2666 }
2667
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 3042 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2671 3044
3045 package CFPlus::UI::Base;
3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h});
3048
3049 my $top = int $self->{children}[1]{range}[0];
3050
3051 my $paridx = 0;
3052 my $top_paragraph;
2672 my $top = int $self->{children}[1]{range}[0]; 3053 my $top = int $self->{children}[1]{range}[0];
2673 3054
2674 my $y0 = $top; 3055 my $y0 = $top;
2675 my $y1 = $top + $H; 3056 my $y1 = $top + $H;
2676 3057
2677 my $y = 0;
2678
2679 my $layout = $self->{layout};
2680
2681 $layout->set_font ($self->{font}) if $self->{font};
2682
2683 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off
2685 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2689 3061
2690 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2691 $layout->set_foreground (@{ $par->[2] }); 3063 my $layout = $self->get_layout ($para);
2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694 $layout->set_markup ($par->[4]);
2695 3064
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3065 $layout->render ($para->{indent}, $y - $y0);
2697 3066
2698 glRasterPos $par->[3], $y - $y0; 3067 if (my @w = @{ $para->{widget} }) {
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3068 my @s = $layout->get_shapes;
3069
3070 for (@w) {
3071 my ($dx, $dy) = splice @s, 0, 2, ();
3072
3073 $_->{x} = $dx + $para->{indent};
3074 $_->{y} = $dy + $y - $y0;
3075
3076 $_->draw;
3077 }
3078 }
2700 } 3079 }
2701 3080
2702 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2703 } 3083 }
2704 3084
2705 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2706 }; 3086 };
2707 }); 3087 });
3088}
3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
2708} 3097}
2709 3098
2710sub _draw { 3099sub _draw {
2711 my ($self) = @_; 3100 my ($self) = @_;
2712 3101
… …
2715 glColor 0, 0, 0, 1; 3104 glColor 0, 0, 0, 1;
2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3105 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2718 3107
2719 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2720
2721} 3109}
2722 3110
2723############################################################################# 3111#############################################################################
2724 3112
2725package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2726 3114
2727use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2728 3116
2729our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2730 3118
2731sub moveto { 3119sub moveto {
2732 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2733 3121
2734 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2762 glPopMatrix; 3150 glPopMatrix;
2763} 3151}
2764 3152
2765############################################################################# 3153#############################################################################
2766 3154
2767package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2768 3156
2769our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2770 3158
2771sub new { 3159sub new {
2772 my $class = shift; 3160 my $class = shift;
2773 3161
2774 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
… …
2786 $self->{other}->toggle_visibility; 3174 $self->{other}->toggle_visibility;
2787} 3175}
2788 3176
2789############################################################################# 3177#############################################################################
2790 3178
2791package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2792 3180
2793our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2794 3182
2795use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2796 3184
2797sub new { 3185sub new {
2798 my $class = shift; 3186 my $class = shift;
2799 3187
2800 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2803 ) 3191 )
2804} 3192}
2805 3193
2806sub set_tooltip_from { 3194sub set_tooltip_from {
2807 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
2808 3199
2809 my $tooltip = $widget->{tooltip}; 3200 my $tooltip = $widget->{tooltip};
2810 3201
2811 if ($ENV{CFPLUS_DEBUG} & 2) { 3202 if ($ENV{CFPLUS_DEBUG} & 2) {
2812 $tooltip .= "\n\n" . (ref $widget) . "\n" 3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2816 } 3207 }
2817 3208
2818 $tooltip =~ s/^\n+//; 3209 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//; 3210 $tooltip =~ s/\n+$//;
2820 3211
2821 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2822 markup => $tooltip, 3213 markup => $tooltip,
2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824 fontsize => 0.8, 3215 fontsize => 0.8,
2825 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2826 ellipsise => 0, 3217 ellipsise => 0,
2827 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2828 ); 3219 );
2829} 3220}
2830 3221
… …
2849 3240
2850 $self->{root}->on_post_alloc ("move_$self" => sub { 3241 $self->{root}->on_post_alloc ("move_$self" => sub {
2851 my $widget = $self->{owner} 3242 my $widget = $self->{owner}
2852 or return; 3243 or return;
2853 3244
3245 if ($widget->{visible}) {
2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855 3247
2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857 if $x + $self->{w} > $self->{root}{w}; 3249 if $x + $self->{w} > $self->{root}{w};
2858 3250
2859 $self->move_abs ($x, $y); 3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
2860 }); 3255 });
2861} 3256}
2862 3257
2863sub _draw { 3258sub _draw {
2864 my ($self) = @_; 3259 my ($self) = @_;
… …
2888 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2889} 3284}
2890 3285
2891############################################################################# 3286#############################################################################
2892 3287
2893package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2894 3289
2895our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2896 3291
2897use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2898 3293
2899sub new { 3294sub new {
2900 my $class = shift; 3295 my $class = shift;
2901 3296
2902 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2904 can_events => 0, 3299 can_events => 0,
2905 @_, 3300 @_,
2906 ); 3301 );
2907 3302
2908 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2909 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2910 3305
2911 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2912 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913 hard => 1, 3308 hard => 1,
2914 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
2937sub _draw { 3332sub _draw {
2938 my ($self) = @_; 3333 my ($self) = @_;
2939 3334
2940 return unless $::CONN; 3335 return unless $::CONN;
2941 3336
3337 $self->SUPER::_draw;
3338
2942 my $face; 3339 my $face;
2943 3340
2944 if ($self->{frame}) { 3341 if ($self->{frame}) {
2945 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
2946 3343
… …
2968 $self->SUPER::destroy; 3365 $self->SUPER::destroy;
2969} 3366}
2970 3367
2971############################################################################# 3368#############################################################################
2972 3369
2973package CFClient::UI::Buttonbar; 3370package CFPlus::UI::Buttonbar;
2974 3371
2975our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2976 3373
2977# TODO: should actualyl wrap buttons and other goodies. 3374# TODO: should actually wrap buttons and other goodies.
2978 3375
2979############################################################################# 3376#############################################################################
2980 3377
2981package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
2982 3379
2983our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2984 3381
2985use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2986 3383
2987sub new { 3384sub new {
2988 my $class = shift; 3385 my $class = shift;
2989 3386
2990 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2991 items => [], 3388 items => [],
2992 z => 100, 3389 z => 100,
2993 @_, 3390 @_,
2994 ); 3391 );
2995 3392
2996 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997 3394
2998 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2999 my ($widget, $cb, $tooltip) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
3000 3397
3001 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
3002 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
3003 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
3004 can_hover => 1, 3404 can_hover => 1,
3005 can_events => 1, 3405 can_events => 1,
3406 tooltip => $tooltip,
3407 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ],
3411 ;
3412
3413 } else {
3414 $widget = new CFPlus::UI::Label
3415 can_hover => 1,
3416 can_events => 1,
3006 markup => $widget, 3417 markup => $widget,
3007 tooltip => $tooltip 3418 tooltip => $tooltip;
3419 }
3008 } 3420 }
3009 3421
3010 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
3011 3423
3012 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
3055 1 3467 1
3056} 3468}
3057 3469
3058############################################################################# 3470#############################################################################
3059 3471
3060package CFClient::UI::Multiplexer; 3472package CFPlus::UI::Multiplexer;
3061 3473
3062our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
3063 3475
3064sub new { 3476sub new {
3065 my $class = shift; 3477 my $class = shift;
3066 3478
3067 my $self = $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
… …
3081 3493
3082 $self->{current} = $self->{children}[0] 3494 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} }; 3495 if @{ $self->{children} };
3084} 3496}
3085 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
3086sub set_current_page { 3504sub set_current_page {
3087 my ($self, $page_or_widget) = @_; 3505 my ($self, $page_or_widget) = @_;
3088 3506
3089 my $widget = ref $page_or_widget 3507 my $widget = ref $page_or_widget
3090 ? $page_or_widget 3508 ? $page_or_widget
… …
3122 $self->{current}->draw; 3540 $self->{current}->draw;
3123} 3541}
3124 3542
3125############################################################################# 3543#############################################################################
3126 3544
3127package CFClient::UI::Notebook; 3545package CFPlus::UI::Notebook;
3128 3546
3129our @ISA = CFClient::UI::VBox::; 3547our @ISA = CFPlus::UI::VBox::;
3130 3548
3131sub new { 3549sub new {
3132 my $class = shift; 3550 my $class = shift;
3133 3551
3134 my $self = $class->SUPER::new ( 3552 my $self = $class->SUPER::new (
3135 buttonbar => (new CFClient::UI::Buttonbar), 3553 buttonbar => (new CFPlus::UI::Buttonbar),
3136 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137 # filter => # will be put between multiplexer and $self 3555 # filter => # will be put between multiplexer and $self
3138 @_, 3556 @_,
3139 ); 3557 );
3140 3558
3141 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3145} 3563}
3146 3564
3147sub add { 3565sub add {
3148 my ($self, $title, $widget, $tooltip) = @_; 3566 my ($self, $title, $widget, $tooltip) = @_;
3149 3567
3150 Scalar::Util::weaken $self; 3568 CFPlus::weaken $self;
3151 3569
3152 $self->{buttonbar}->add (new CFClient::UI::Button 3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3153 markup => $title, 3571 markup => $title,
3154 tooltip => $tooltip, 3572 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) }, 3573 on_activate => sub { $self->set_current_page ($widget) },
3156 ); 3574 );
3157 3575
3158 $self->{multiplexer}->add ($widget); 3576 $self->{multiplexer}->add ($widget);
3159} 3577}
3160 3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3161sub set_current_page { 3585sub set_current_page {
3162 my ($self, $page) = @_; 3586 my ($self, $page) = @_;
3163 3587
3164 $self->{multiplexer}->set_current_page ($page); 3588 $self->{multiplexer}->set_current_page ($page);
3165 $self->emit (page_changed => $self->{multiplexer}{current}); 3589 $self->emit (page_changed => $self->{multiplexer}{current});
3166} 3590}
3167 3591
3168############################################################################# 3592#############################################################################
3169 3593
3170package CFClient::UI::Combobox; 3594package CFPlus::UI::Selector;
3171 3595
3172use utf8; 3596use utf8;
3173 3597
3174our @ISA = CFClient::UI::Button::; 3598our @ISA = CFPlus::UI::Button::;
3175 3599
3176sub new { 3600sub new {
3177 my $class = shift; 3601 my $class = shift;
3178 3602
3179 my $self = $class->SUPER::new ( 3603 my $self = $class->SUPER::new (
… …
3196 my ($value, $title, $tooltip) = @$_; 3620 my ($value, $title, $tooltip) = @$_;
3197 3621
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 } 3623 }
3200 3624
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202} 3626}
3203 3627
3204sub _set_value { 3628sub _set_value {
3205 my ($self, $value) = @_; 3629 my ($self, $value) = @_;
3206 3630
… …
3221 $self->emit (changed => $value); 3645 $self->emit (changed => $value);
3222} 3646}
3223 3647
3224############################################################################# 3648#############################################################################
3225 3649
3226package CFClient::UI::Statusbox; 3650package CFPlus::UI::Statusbox;
3227 3651
3228our @ISA = CFClient::UI::VBox::; 3652our @ISA = CFPlus::UI::VBox::;
3229 3653
3230sub new { 3654sub new {
3231 my $class = shift; 3655 my $class = shift;
3232 3656
3233 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
3234 fontsize => 0.8, 3658 fontsize => 0.8,
3235 @_, 3659 @_,
3236 ); 3660 );
3237 3661
3238 Scalar::Util::weaken (my $this = $self); 3662 CFPlus::weaken (my $this = $self);
3239 3663
3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241 3665
3242 $self 3666 $self
3243} 3667}
… …
3245sub reorder { 3669sub reorder {
3246 my ($self) = @_; 3670 my ($self) = @_;
3247 my $NOW = Time::HiRes::time; 3671 my $NOW = Time::HiRes::time;
3248 3672
3249 # freeze display when hovering over any label 3673 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner} 3674 return if $CFPlus::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} }; 3676 values %{ $self->{item} };
3253 3677
3254 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
3255 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256 } 3680 }
… …
3277 for ($short) { 3701 for ($short) {
3278 s/^\s+//; 3702 s/^\s+//;
3279 s/\s+/ /g; 3703 s/\s+/ /g;
3280 } 3704 }
3281 3705
3282 new CFClient::UI::Label 3706 new CFPlus::UI::Label
3283 markup => $short, 3707 markup => $short,
3284 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
3285 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
3286 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
3287 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3341 count => 1, 3765 count => 1,
3342 %arg, 3766 %arg,
3343 }; 3767 };
3344 } 3768 }
3345 3769
3770 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3771 $self->reorder;
3772 });
3347} 3773}
3348 3774
3349sub reconfigure { 3775sub reconfigure {
3350 my ($self) = @_; 3776 my ($self) = @_;
3351 3777
… …
3364 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3365} 3791}
3366 3792
3367############################################################################# 3793#############################################################################
3368 3794
3369package CFClient::UI::Inventory;
3370
3371our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373sub new {
3374 my $class = shift;
3375
3376 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378 @_,
3379 );
3380
3381 $self
3382}
3383
3384sub set_items {
3385 my ($self, $items) = @_;
3386
3387 $self->{child}->clear;
3388 return unless $items;
3389
3390 my @items = sort {
3391 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name})
3393 } @$items;
3394
3395 $self->{real_items} = \@items;
3396
3397 my $row = 0;
3398 for my $item (@items) {
3399 CFClient::Item::update_widgets $item;
3400
3401 $self->{child}->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget});
3404
3405 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 }
3605}
3606
3607#############################################################################
3608
3609package CFClient::UI::SpellList;
3610
3611our @ISA = CFClient::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 binding => [],
3618 commands => [],
3619 @_,
3620 )
3621}
3622
3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3708sub add_spell {
3709 my ($self, $spell) = @_;
3710
3711 $self->{spell}->{$spell->{name}} = $spell;
3712 $self->rebuild_spell_list;
3713}
3714
3715sub remove_spell {
3716 my ($self, $spell) = @_;
3717
3718 delete $self->{spell}->{$spell->{name}};
3719 $self->rebuild_spell_list;
3720}
3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3729#############################################################################
3730
3731package CFClient::UI::Root; 3795package CFPlus::UI::Root;
3732 3796
3733our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
3734 3798
3735use List::Util qw(min max); 3799use List::Util qw(min max);
3736 3800
3737use CFClient::OpenGL; 3801use CFPlus::OpenGL;
3738 3802
3739sub new { 3803sub new {
3740 my $class = shift; 3804 my $class = shift;
3741 3805
3742 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3743 visible => 1, 3807 visible => 1,
3744 @_, 3808 @_,
3745 ); 3809 );
3746 3810
3747 Scalar::Util::weaken ($self->{root} = $self); 3811 CFPlus::weaken ($self->{root} = $self);
3748 3812
3749 $self 3813 $self
3750} 3814}
3751 3815
3752sub size_request { 3816sub size_request {
… …
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919 3983
3920 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3921 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3922 3986
3987 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h;
3989
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995
3923 $w = int $w + 0.5; 3996 $w = int $w + 0.5;
3924 $h = int $h + 0.5; 3997 $h = int $h + 0.5;
3925 3998
3926 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927 $widget->{old_w} = $widget->{w}; 4000 $widget->{old_w} = $widget->{w};
… …
3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3952 glLoadIdentity; 4025 glLoadIdentity;
3953 4026
3954 { 4027 {
3955 package CFClient::UI::Base; 4028 package CFPlus::UI::Base;
3956 4029
3957 ($draw_x, $draw_y, $draw_w, $draw_h) = 4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958 (0, 0, $self->{w}, $self->{h}); 4031 (0, 0, $self->{w}, $self->{h});
3959 }
3960 4032
3961 $self->_draw; 4033 $self->_draw;
4034 }
3962} 4035}
3963 4036
3964############################################################################# 4037#############################################################################
3965 4038
3966package CFClient::UI; 4039package CFPlus::UI;
3967 4040
3968$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3969$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970 4043
39711 40441
3972 4045

Diff Legend

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