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

Diff Legend

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