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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 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) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $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; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $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}; 256 $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}; 257 $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}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
474} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
539 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
540 602
541 # update screen rectangle 603 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 606
547 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 610
… …
573 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
576 glEnd; 636 glEnd;
577 glPopMatrix; 637 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 } 639 }
580 640
581 $self->_draw; 641 $self->_draw;
582 glPopMatrix; 642 glPopMatrix;
583} 643}
… …
586 my ($self) = @_; 646 my ($self) = @_;
587 647
588 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
589} 649}
590 650
651my $cntx;#d#
591sub DESTROY { 652sub DESTROY {
592 my ($self) = @_; 653 my ($self) = @_;
593 654
594 delete $WIDGET{$self+0}; 655 return if CFPlus::in_destruct;
595 656
596 eval { $self->destroy }; 657 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
660 delete $WIDGET{$self+0};
598} 661}
599 662
600############################################################################# 663#############################################################################
601 664
602package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
603 666
604our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
605 668
606use strict; 669use strict;
607use CFClient::OpenGL; 670use CFPlus::OpenGL;
608 671
609sub new { 672sub new {
610 my $class = shift; 673 my $class = shift;
611 674
612 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
643 } 706 }
644} 707}
645 708
646############################################################################# 709#############################################################################
647 710
648package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
649 712
650our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
651 714
652sub new { 715sub new {
653 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
655} 718}
… …
662 725
663sub draw { } 726sub draw { }
664 727
665############################################################################# 728#############################################################################
666 729
667package CFClient::UI::Container; 730package CFPlus::UI::Container;
668 731
669our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
670 733
671sub new { 734sub new {
672 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
673 736
674 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
678 can_events => 0, 741 can_events => 0,
679 %arg, 742 %arg,
680 ); 743 );
681 744
682 $self->add (@$children) 745 $self->add (@$children)
683 if $children; 746 if $children && @$children;
684 747
685 $self 748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
686} 757}
687 758
688sub add { 759sub add {
689 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
690 761
691 $_->set_parent ($self) 762 $_->set_parent ($self)
692 for @widgets; 763 for @widgets;
693 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
694 use sort 'stable'; 766 use sort 'stable';
695 767
696 $self->{children} = [ 768 $self->{children} = [
697 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
698 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
717} 789}
718 790
719sub clear { 791sub clear {
720 my ($self) = @_; 792 my ($self) = @_;
721 793
722 my $children = delete $self->{children}; 794 my $children = $self->{children};
723 $self->{children} = []; 795 $self->{children} = [];
724 796
725 for (@$children) { 797 for (@$children) {
726 delete $_->{parent}; 798 delete $_->{parent};
727 $_->hide; 799 $_->hide;
… …
752 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
753} 825}
754 826
755############################################################################# 827#############################################################################
756 828
757package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
758 830
759our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
760 832
761sub new { 833sub new {
762 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
763 835
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 837
766 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
767} 839}
768 840
769sub add { 841sub add {
… …
776sub remove { 848sub remove {
777 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
778 850
779 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
780 852
781 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 854 unless @{$self->{children}};
783} 855}
784 856
785sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
786 858
… …
798 870
799############################################################################# 871#############################################################################
800 872
801# back-buffered drawing area 873# back-buffered drawing area
802 874
803package CFClient::UI::Window; 875package CFPlus::UI::Window;
804 876
805our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
806 878
807use CFClient::OpenGL; 879use CFPlus::OpenGL;
808 880
809sub new { 881sub new {
810 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
811 883
812 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
834} 906}
835 907
836sub render_child { 908sub render_child {
837 my ($self) = @_; 909 my ($self) = @_;
838 910
839 $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 {
840 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
842 914
843 { 915 {
844 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
845 917
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
848 } 922 }
849
850 $self->_render;
851 }; 923 };
852} 924}
853 925
854sub _draw { 926sub _draw {
855 my ($self) = @_; 927 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 928
859 my $tex = $self->{texture} 929 my $tex = $self->{texture}
860 or return; 930 or return;
861 931
862 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
865 935
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
867 937
868 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
869} 939}
870 940
871############################################################################# 941#############################################################################
872 942
873package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
874 944
945use List::Util qw(min max);
946
875our @ISA = CFClient::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
876 948
877sub new { 949sub new {
878 my $class = shift; 950 my $class = shift;
879 951
880 $class->SUPER::new ( 952 $class->SUPER::new (
… …
887sub size_request { 959sub size_request {
888 my ($self) = @_; 960 my ($self) = @_;
889 961
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 963
892 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
894 966
895 ($w, $h) 967 ($w, $h)
896} 968}
897 969
898sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
910} 982}
911 983
912sub set_offset { 984sub set_offset {
913 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
914 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
917 993
994 $self->emit (changed => $x, $y);
918 $self->update; 995 $self->update;
996 }
919} 997}
920 998
921# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 1000sub coord2local {
923 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
939 1017
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1020 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1022 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1024 }
947} 1025}
948 1026
949sub _render { 1027sub _render {
950 my ($self) = @_; 1028 my ($self) = @_;
951 1029
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1030 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1031 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1032
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1034
957 $self->SUPER::_render; 1035 $self->SUPER::_render;
958} 1036}
959 1037
960############################################################################# 1038#############################################################################
961 1039
962package CFClient::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
963 1041
964our @ISA = CFClient::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
965 1043
966sub new { 1044sub new {
967 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
968 1046
969 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
970 1048
971 my $self; 1049 my $self;
972 1050
973 my $slider = new CFClient::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
974 vertical => 1, 1065 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1067 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1070 },
979 ; 1071 ;
980 1072
981 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
983 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
984 %arg, 1081 %arg,
985 ); 1082 );
986 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
988 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
989 1103
990 $self 1104 $self
991} 1105}
992 1106
… …
994 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
995 1109
996 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
997} 1111}
998 1112
999sub update { 1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider});
1126 }
1127
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130
1131 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139sub start_dragging {
1000 my ($self) = @_; 1140 my ($self, $ev) = @_;
1001 1141
1002 $self->SUPER::update; 1142 $self->grab_focus;
1003 1143
1004 # todo: overwrite size_allocate of child 1144 my $ox = $self->{vp}{view_x};
1005 my $child = $self->{vp}->child; 1145 my $oy = $self->{vp}{view_y};
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1146
1147 $self->{motion} = sub {
1148 my ($ev, $x, $y) = @_;
1149
1150 $ox -= $ev->{xrel};
1151 $oy -= $ev->{yrel};
1152
1153 $self->{vp}->set_offset ($ox, $oy);
1154 };
1155}
1156
1157sub invoke_mouse_wheel {
1158 my ($self, $ev) = @_;
1159
1160 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1161 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1162
1163 1
1164}
1165
1166sub invoke_button_down {
1167 my ($self, $ev, $x, $y) = @_;
1168
1169 if ($ev->{button} == 2) {
1170 $self->start_dragging ($ev);
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_button_up {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if (delete $self->{motion}) {
1181 return 1;
1182 }
1183
1184 0
1185}
1186
1187sub invoke_mouse_motion {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($self->{motion}) {
1191 $self->{motion}->($ev, $x, $y);
1192 return 1;
1193 }
1194
1195 0
1007} 1196}
1008 1197
1009sub invoke_size_allocate { 1198sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1199 my ($self, $w, $h) = @_;
1011 1200
1012 my $child = $self->{vp}->child; 1201 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1202 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1203}
1017 1204
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1205#############################################################################
1022 1206
1023package CFClient::UI::Frame; 1207package CFPlus::UI::Frame;
1024 1208
1025our @ISA = CFClient::UI::Bin::; 1209our @ISA = CFPlus::UI::Bin::;
1026 1210
1027use CFClient::OpenGL; 1211use CFPlus::OpenGL;
1028 1212
1029sub new { 1213sub new {
1030 my $class = shift; 1214 my $class = shift;
1031 1215
1032 $class->SUPER::new ( 1216 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1242 $self->SUPER::_draw;
1059} 1243}
1060 1244
1061############################################################################# 1245#############################################################################
1062 1246
1063package CFClient::UI::FancyFrame; 1247package CFPlus::UI::FancyFrame;
1064 1248
1065our @ISA = CFClient::UI::Bin::; 1249our @ISA = CFPlus::UI::Bin::;
1066 1250
1067use CFClient::OpenGL; 1251use CFPlus::OpenGL;
1252
1253sub new {
1254 my ($class, %arg) = @_;
1255
1256 if ((exists $arg{label}) && !ref $arg{label}) {
1257 $arg{label} = new CFPlus::UI::Label
1258 align => 1,
1259 valign => 0,
1260 text => $arg{label},
1261 fontsize => ($arg{border} || 0.8) * 0.75;
1262 }
1263
1264 my $self = $class->SUPER::new (
1265 # label => "",
1266 fg => [0.6, 0.3, 0.1],
1267 border => 0.8,
1268 style => 'single',
1269 %arg,
1270 );
1271
1272 $self
1273}
1274
1275sub add {
1276 my ($self, @widgets) = @_;
1277
1278 $self->SUPER::add (@widgets);
1279 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1280}
1281
1282sub border {
1283 int $_[0]{border} * $::FONTSIZE
1284}
1285
1286sub size_request {
1287 my ($self) = @_;
1288
1289 ($self->{label_w}, undef) = $self->{label}->size_request
1290 if $self->{label};
1291
1292 my ($w, $h) = $self->SUPER::size_request;
1293
1294 (
1295 $w + $self->border * 2,
1296 $h + $self->border * 2,
1297 )
1298}
1299
1300sub invoke_size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 my $border = $self->border;
1304
1305 $w -= List::Util::max 0, $border * 2;
1306 $h -= List::Util::max 0, $border * 2;
1307
1308 if (my $label = $self->{label}) {
1309 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1310 $label->{h} = List::Util::min $h, $border;
1311 $label->invoke_size_allocate ($label->{w}, $label->{h});
1312 }
1313
1314 $self->child->configure ($border, $border, $w, $h);
1315
1316 1
1317}
1318
1319sub _draw {
1320 my ($self) = @_;
1321
1322 my $child = $self->{children}[0];
1323
1324 my $border = $self->border;
1325 my ($w, $h) = ($self->{w}, $self->{h});
1326
1327 $child->draw;
1328
1329 glColor @{$self->{fg}};
1330 glBegin GL_LINE_STRIP;
1331 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1337 glEnd;
1338
1339 if ($self->{label}) {
1340 glTranslate $border * 2, 0;
1341 $self->{label}->_draw;
1342 }
1343}
1344
1345#############################################################################
1346
1347package CFPlus::UI::Toplevel;
1348
1349our @ISA = CFPlus::UI::Bin::;
1350
1351use CFPlus::OpenGL;
1068 1352
1069my $bg = 1353my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1354 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1355 mipmap => 1, wrap => 1;
1072 1356
1073my @border = 1357my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1360
1361my @icon =
1362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1363 qw(x1_move.png x1_resize.png);
1076 1364
1077sub new { 1365sub new {
1078 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1079 1367
1080 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1370 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1371 border => 0.6,
1084 can_events => 1, 1372 can_events => 1,
1085 min_w => 16, 1373 min_w => 64,
1086 min_h => 16, 1374 min_h => 32,
1087 %arg, 1375 %arg,
1088 ); 1376 );
1089 1377
1090 $self->{title_widget} = new CFClient::UI::Label 1378 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1379 align => 0,
1092 valign => 1, 1380 valign => 1,
1093 text => $self->{title}, 1381 text => $self->{title},
1094 fontsize => $self->{border}, 1382 fontsize => $self->{border},
1095 if exists $self->{title}; 1383 if exists $self->{title};
1096 1384
1097 if ($self->{has_close_button}) { 1385 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1386 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1387 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1388 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1389 on_activate => sub { $self->emit ("delete") };
1102 1390
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1391 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1392 }
1105 1393
1106 $self 1394 $self
1107} 1395}
1108 1396
1109sub add { 1397sub add {
1110 my ($self, @widgets) = @_; 1398 my ($self, @widgets) = @_;
1111 1399
1112 $self->SUPER::add (@widgets); 1400 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1401 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1402 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1403}
1116 1404
1117sub border { 1405sub border {
1118 int $_[0]{border} * $::FONTSIZE 1406 int $_[0]{border} * $::FONTSIZE
1119} 1407}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1440 $self->child->configure ($border, $border, $w, $h);
1153 1441
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1442 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1443 if $self->{close_button};
1156 1444
1445 1
1446}
1447
1448sub invoke_delete {
1449 my ($self) = @_;
1450
1451 $self->hide;
1452
1157 1 1453 1
1158} 1454}
1159 1455
1160sub invoke_button_down { 1456sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1457 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1515 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1516
1221 ! ! $self->{motion} 1517 ! ! $self->{motion}
1222} 1518}
1223 1519
1520sub invoke_visibility_change {
1521 my ($self, $visible) = @_;
1522
1523 delete $self->{motion} unless $visible;
1524
1525 0
1526}
1527
1224sub _draw { 1528sub _draw {
1225 my ($self) = @_; 1529 my ($self) = @_;
1226 1530
1227 my $child = $self->{children}[0]; 1531 my $child = $self->{children}[0];
1228 1532
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1537 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1538
1235 my $border = $self->border; 1539 my $border = $self->border;
1236 1540
1237 glColor @{ $self->{border_bg} }; 1541 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1542 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1543 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1544 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1545 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1546
1547 # move
1548 my $w2 = ($w - $border) * .5;
1549 my $h2 = ($h - $border) * .5;
1550 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1553
1554 # resize
1555 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1556 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1557 unless $self->{has_close_button};
1558 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1560
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1561 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1562 glColor @{ $self->{bg} };
1245 1563
1246 # TODO: repeat texture not scale 1564 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1583 if $self->{close_button};
1266} 1584}
1267 1585
1268############################################################################# 1586#############################################################################
1269 1587
1270package CFClient::UI::Table; 1588package CFPlus::UI::Table;
1271 1589
1272our @ISA = CFClient::UI::Base::; 1590our @ISA = CFPlus::UI::Container::;
1273 1591
1274use List::Util qw(max sum); 1592use List::Util qw(max sum);
1275 1593
1276use CFClient::OpenGL; 1594use CFPlus::OpenGL;
1277 1595
1278sub new { 1596sub new {
1279 my $class = shift; 1597 my $class = shift;
1280 1598
1281 $class->SUPER::new ( 1599 $class->SUPER::new (
1282 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1283 @_, 1602 @_,
1284 ) 1603 )
1285} 1604}
1286 1605
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1606sub add {
1292 my ($self, $x, $y, $child) = @_; 1607 my ($self, @widgets) = @_;
1293 1608
1294 $child->set_parent ($self); 1609 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1610 $child->{rowspan} ||= 1;
1611 $child->{colspan} ||= 1;
1612 }
1296 1613
1297 $self->realloc; 1614 $self->SUPER::add (@widgets);
1298} 1615}
1299 1616
1300sub remove { 1617sub add_at {
1618 my $self = shift;
1619
1620 my @widgets;
1621
1622 while (@_) {
1623 my ($col, $row, $child) = splice @_, 0, 3, ();
1624
1625 $child->{row} = $row;
1626 $child->{col} = $col;
1627
1628 push @widgets, $child;
1629 }
1630
1631 $self->add (@widgets);
1632}
1633
1634sub get_wh {
1301 my ($self, $child) = @_; 1635 my ($self) = @_;
1302 1636
1303 # TODO: not yet implemented 1637 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1638
1310 my @children = $self->children; 1639 my @children = $self->children;
1311 delete $self->{children}; 1640
1641 # first pass, columns
1642 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1643 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1644
1645 my $sw = sum @w[$c .. $c + $cs - 1];
1646
1647 if ($w > $sw) {
1648 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1649 }
1312 1650 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1651
1318 $self->realloc; 1652 # second pass, rows
1319} 1653 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1654 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1655
1335 $w[$x] = max $w[$x], $w; 1656 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1657
1658 if ($h > $sh) {
1659 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1660 }
1338 } 1661 }
1339 1662
1340 (\@w, \@h) 1663 (\@w, \@h)
1341} 1664}
… …
1357 my ($ws, $hs) = $self->get_wh; 1680 my ($ws, $hs) = $self->get_wh;
1358 1681
1359 my $req_w = (sum @$ws) || 1; 1682 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1683 my $req_h = (sum @$hs) || 1;
1361 1684
1362 # TODO: nicer code && do row_expand 1685 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1686 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1687 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1688 my $col_expand = (sum @col_expand) || 1;
1366 1689
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1690 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1691
1371 CFClient::UI::harmonize $ws; 1692 CFPlus::UI::harmonize $ws;
1693
1694 my @row_expand = @{$self->{row_expand}};
1695 @row_expand = (1) x @$ws unless @row_expand;
1696 my $row_expand = (sum @row_expand) || 1;
1697
1698 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1699
1372 CFClient::UI::harmonize $hs; 1700 CFPlus::UI::harmonize $hs;
1373 1701
1374 my $y; 1702 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1703 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1704
1376 for my $r (0 .. $#{$self->{children}}) { 1705 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1706 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1707
1380 my $x = 0; 1708 $widget->configure (
1381 my $row_h = $hs->[$r]; 1709 $x[$c], $y[$r],
1710 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1711 );
1383 for my $c (0 .. $#$row) { 1712 }
1384 my $col_w = $ws->[$c];
1385 1713
1386 if (my $widget = $row->[$c]) { 1714 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1715}
1388 }
1389 1716
1390 $x += $col_w; 1717#############################################################################
1718
1719package CFPlus::UI::Fixed;
1720
1721use List::Util qw(min max);
1722
1723our @ISA = CFPlus::UI::Container::;
1724
1725sub add {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child);
1730}
1731
1732sub _scale($$$) {
1733 my ($mode, $val, $max) = @_;
1734
1735 $mode eq "abs" ? $val
1736 : $mode eq "rel" ? $val * $max
1737 : 0
1738}
1739
1740sub size_request {
1741 my ($self) = @_;
1742
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744
1745 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) {
1747 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1748
1749 if ($pos eq "abs") {
1750 $w = _scale $size, $w, $child->{req_w};
1751 $h = _scale $size, $h, $child->{req_h};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391 } 1755 }
1756 }
1392 1757
1393 $y += $row_h; 1758 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1;
1760
1761 # now layout remaining widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos ne "abs") {
1766 $x = _scale $pos, $x, $W;
1767 $y = _scale $pos, $x, $H;
1768 $w = _scale $size, $w, $child->{req_w};
1769 $h = _scale $size, $h, $child->{req_h};
1770
1771 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1772 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1773 }
1774 }
1775
1776 my $W = $x2 - $x1;
1777 my $H = $y2 - $y1;
1778
1779 ($W, $H)
1780}
1781
1782sub invoke_size_allocate {
1783 my ($self, $W, $H) = @_;
1784
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $child->configure ($x, $y, $w, $h);
1394 } 1794 }
1395 1795
1396 1 1796 1
1397} 1797}
1398 1798
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1799#############################################################################
1424 1800
1425package CFClient::UI::Box; 1801package CFPlus::UI::Box;
1426 1802
1427our @ISA = CFClient::UI::Container::; 1803our @ISA = CFPlus::UI::Container::;
1428 1804
1429sub size_request { 1805sub size_request {
1430 my ($self) = @_; 1806 my ($self) = @_;
1431 1807
1432 $self->{vertical} 1808 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1841 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1842 for 0 .. $#children;
1467 } 1843 }
1468 } 1844 }
1469 1845
1470 CFClient::UI::harmonize \@req; 1846 CFPlus::UI::harmonize \@req;
1471 1847
1472 my $pos = 0; 1848 my $pos = 0;
1473 for (0 .. $#children) { 1849 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1850 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1851 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1856 1
1481} 1857}
1482 1858
1483############################################################################# 1859#############################################################################
1484 1860
1485package CFClient::UI::HBox; 1861package CFPlus::UI::HBox;
1486 1862
1487our @ISA = CFClient::UI::Box::; 1863our @ISA = CFPlus::UI::Box::;
1488 1864
1489sub new { 1865sub new {
1490 my $class = shift; 1866 my $class = shift;
1491 1867
1492 $class->SUPER::new ( 1868 $class->SUPER::new (
… …
1495 ) 1871 )
1496} 1872}
1497 1873
1498############################################################################# 1874#############################################################################
1499 1875
1500package CFClient::UI::VBox; 1876package CFPlus::UI::VBox;
1501 1877
1502our @ISA = CFClient::UI::Box::; 1878our @ISA = CFPlus::UI::Box::;
1503 1879
1504sub new { 1880sub new {
1505 my $class = shift; 1881 my $class = shift;
1506 1882
1507 $class->SUPER::new ( 1883 $class->SUPER::new (
… …
1510 ) 1886 )
1511} 1887}
1512 1888
1513############################################################################# 1889#############################################################################
1514 1890
1515package CFClient::UI::Label; 1891package CFPlus::UI::Label;
1516 1892
1517our @ISA = CFClient::UI::DrawBG::; 1893our @ISA = CFPlus::UI::DrawBG::;
1518 1894
1519use CFClient::OpenGL; 1895use CFPlus::OpenGL;
1520 1896
1521sub new { 1897sub new {
1522 my ($class, %arg) = @_; 1898 my ($class, %arg) = @_;
1523 1899
1524 my $self = $class->SUPER::new ( 1900 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1903 #active_bg => none
1528 #font => default_font 1904 #font => default_font
1529 #text => initial text 1905 #text => initial text
1530 #markup => initial narkup 1906 #markup => initial narkup
1531 #max_w => maximum pixel width 1907 #max_w => maximum pixel width
1908 #style => 0, # render flags
1532 ellipsise => 3, # end 1909 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1910 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1911 fontsize => 1,
1535 align => -1, 1912 align => -1,
1536 valign => -1, 1913 valign => -1,
1537 padding_x => 2, 1914 padding_x => 2,
1538 padding_y => 2, 1915 padding_y => 2,
1539 can_events => 0, 1916 can_events => 0,
1540 %arg 1917 %arg
1541 ); 1918 );
1542 1919
1543 if (exists $self->{template}) { 1920 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1921 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1922 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1923 $self->{template} = $layout;
1547 } 1924 }
1548 1925
1549 if (exists $self->{markup}) { 1926 if (exists $self->{markup}) {
… …
1553 } 1930 }
1554 1931
1555 $self 1932 $self
1556} 1933}
1557 1934
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1935sub update {
1569 my ($self) = @_; 1936 my ($self) = @_;
1570 1937
1571 delete $self->{texture}; 1938 delete $self->{texture};
1572 $self->SUPER::update; 1939 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1950 my ($self, $text) = @_;
1584 1951
1585 return if $self->{text} eq "T$text"; 1952 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1953 $self->{text} = "T$text";
1587 1954
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1955 $self->{layout}->set_text ($text);
1590 1956
1591 delete $self->{size_req}; 1957 delete $self->{size_req};
1592 $self->realloc; 1958 $self->realloc;
1593 $self->update; 1959 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1965 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1966 $self->{text} = "M$markup";
1601 1967
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1968 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1969
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1970 $self->{layout}->set_markup ($markup);
1606 1971
1607 delete $self->{size_req}; 1972 delete $self->{size_req};
1608 $self->realloc; 1973 $self->realloc;
1609 $self->update; 1974 $self->update;
… …
1621 1986
1622 my ($w, $h) = $self->{layout}->size; 1987 my ($w, $h) = $self->{layout}->size;
1623 1988
1624 if (exists $self->{template}) { 1989 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1990 $self->{template}->set_font ($self->{font}) if $self->{font};
1991 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1992 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1993
1628 my ($w2, $h2) = $self->{template}->size; 1994 my ($w2, $h2) = $self->{template}->size;
1629 1995
1630 $w = List::Util::max $w, $w2; 1996 $w = List::Util::max $w, $w2;
… …
1654 2020
1655sub set_fontsize { 2021sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2022 my ($self, $fontsize) = @_;
1657 2023
1658 $self->{fontsize} = $fontsize; 2024 $self->{fontsize} = $fontsize;
2025 delete $self->{size_req};
1659 delete $self->{texture}; 2026 delete $self->{texture};
1660 2027
1661 $self->realloc; 2028 $self->realloc;
1662} 2029}
1663 2030
1664sub reconfigure { 2031sub reconfigure {
1665 my ($self) = @_; 2032 my ($self) = @_;
1666 2033
1667 delete $self->{size_req}; 2034 delete $self->{size_req};
2035 delete $self->{texture};
1668 2036
1669 $self->SUPER::reconfigure; 2037 $self->SUPER::reconfigure;
1670} 2038}
1671 2039
1672sub _draw { 2040sub _draw {
1673 my ($self) = @_; 2041 my ($self) = @_;
1674 2042
1675 $self->SUPER::_draw; # draw background, if applicable 2043 $self->SUPER::_draw; # draw background, if applicable
1676 2044
1677 my $tex = $self->{texture} ||= do { 2045 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2046 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2047 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2048 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2049 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2050 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2051 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2052
1685 new_from_layout CFClient::Texture $self->{layout} 2053 [$self->{layout}->size]
1686 }; 2054 };
1687 2055
1688 unless (exists $self->{ox}) { 2056 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2057 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2058 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2059 : ($self->{w} - $size->[0]) * 0.5);
1692 2060
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2061 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2062 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2063 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2064 };
1697 2065
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2066 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2067 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2068
1703 if ($tex->{format} == GL_ALPHA) { 2069 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 2070}
1714 2071
1715############################################################################# 2072#############################################################################
1716 2073
1717package CFClient::UI::EntryBase; 2074package CFPlus::UI::EntryBase;
1718 2075
1719our @ISA = CFClient::UI::Label::; 2076our @ISA = CFPlus::UI::Label::;
1720 2077
1721use CFClient::OpenGL; 2078use CFPlus::OpenGL;
1722 2079
1723sub new { 2080sub new {
1724 my $class = shift; 2081 my $class = shift;
1725 2082
1726 $class->SUPER::new ( 2083 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2087 active_fg => [0, 0, 0],
1731 can_hover => 1, 2088 can_hover => 1,
1732 can_focus => 1, 2089 can_focus => 1,
1733 valign => 0, 2090 valign => 0,
1734 can_events => 1, 2091 can_events => 1,
2092 ellipsise => 0,
1735 #text => ... 2093 #text => ...
1736 #hidden => "*", 2094 #hidden => "*",
1737 @_ 2095 @_
1738 ) 2096 )
1739} 2097}
… …
1784 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2143 my $uni = $ev->{unicode};
1786 2144
1787 my $text = $self->get_text; 2145 my $text = $self->get_text;
1788 2146
2147 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2148
1789 if ($uni == 8) { 2149 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2150 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2151 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2152 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2153 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2154 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2155 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2156 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2157 } elsif ($sym == CFPlus::SDLK_HOME) {
2158 # what a hack
2159 $self->{cursor} =
2160 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2161 ? length $1
2162 : 0;
2163 } elsif ($sym == CFPlus::SDLK_END) {
2164 # uh, again
2165 $self->{cursor} =
2166 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2167 ? $self->{cursor} + length $1
2168 : length $self->{text};
2169 } elsif ($uni == 21) { # ctrl-u
2170 $text = "";
1798 $self->{cursor} = 0; 2171 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2172 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2173 $self->emit ('escape');
1803 } elsif ($uni) { 2174 } elsif ($uni == 0x0d) {
2175 substr $text, $self->{cursor}++, 0, "\012";
2176 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2177 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2178 } else {
1806 return 0; 2179 return 0;
1807 } 2180 }
1808 2181
1809 $self->_set_text ($text); 2182 $self->_set_text ($text);
1810 2183
1811 $self->realloc; 2184 $self->realloc;
2185 $self->update;
1812 2186
1813 1 2187 1
1814} 2188}
1815 2189
1816sub invoke_focus_in { 2190sub invoke_focus_in {
… …
1828 2202
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2203 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2204
1831 # byte-index to char-index 2205 # byte-index to char-index
1832 my $text = $self->{text}; 2206 my $text = $self->{text};
1833 utf8::encode $text; 2207 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2208 $self->{cursor} = length $text;
1835 2209
1836 $self->_set_text ($self->{text}); 2210 $self->_set_text ($self->{text});
1837 $self->update; 2211 $self->update;
1838 2212
1839 1 2213 1
… …
1878 utf8::encode $text; 2252 utf8::encode $text;
1879 2253
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2255 }
1882 2256
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2257 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2260 glEnd;
1888 } 2261 }
1889} 2262}
1890 2263
2264#############################################################################
2265
1891package CFClient::UI::Entry; 2266package CFPlus::UI::Entry;
1892 2267
1893our @ISA = CFClient::UI::EntryBase::; 2268our @ISA = CFPlus::UI::EntryBase::;
1894 2269
1895use CFClient::OpenGL; 2270use CFPlus::OpenGL;
1896 2271
1897sub invoke_key_down { 2272sub invoke_key_down {
1898 my ($self, $ev) = @_; 2273 my ($self, $ev) = @_;
1899 2274
1900 my $sym = $ev->{sym}; 2275 my $sym = $ev->{sym};
1901 2276
1902 if ($sym == 13) { 2277 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2278 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2279 my $txt = $self->get_text;
1905 2280
1906 $self->{history_pointer} = -1; 2281 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2282 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2283 $self->emit (activate => $txt);
1909 $self->update; 2284 $self->update;
1910 2285
1911 } elsif ($sym == CFClient::SDLK_UP) { 2286 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2287 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2288 $self->{history_saveback} = $self->get_text;
1914 } 2289 }
1915 if (@{$self->{history} || []} > 0) { 2290 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2291 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2293 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2294 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2295 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2296 }
1922 2297
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2298 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2299 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2300 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2301
1927 if ($self->{history_pointer} >= 0) { 2302 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2303 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2312 1
1938} 2313}
1939 2314
1940############################################################################# 2315#############################################################################
1941 2316
2317package CFPlus::UI::TextEdit;
2318
2319our @ISA = CFPlus::UI::EntryBase::;
2320
2321use CFPlus::OpenGL;
2322
2323sub move_cursor_ver {
2324 my ($self, $dy) = @_;
2325
2326 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2327
2328 $y += $dy;
2329
2330 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2331 $self->{cursor} = $index;
2332 delete $self->{cur_h};
2333 $self->update;
2334 return;
2335 }
2336}
2337
2338sub invoke_key_down {
2339 my ($self, $ev) = @_;
2340
2341 my $sym = $ev->{sym};
2342
2343 if ($sym == CFPlus::SDLK_UP) {
2344 $self->move_cursor_ver (-1);
2345 } elsif ($sym == CFPlus::SDLK_DOWN) {
2346 $self->move_cursor_ver (+1);
2347 } else {
2348 return $self->SUPER::invoke_key_down ($ev)
2349 }
2350
2351 1
2352}
2353
2354#############################################################################
2355
1942package CFClient::UI::Button; 2356package CFPlus::UI::Button;
1943 2357
1944our @ISA = CFClient::UI::Label::; 2358our @ISA = CFPlus::UI::Label::;
1945 2359
1946use CFClient::OpenGL; 2360use CFPlus::OpenGL;
1947 2361
1948my @tex = 2362my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2364 qw(b1_button_inactive.png b1_button_active.png);
1951 2365
1952sub new { 2366sub new {
1953 my $class = shift; 2367 my $class = shift;
1954 2368
1955 $class->SUPER::new ( 2369 $class->SUPER::new (
1956 padding_x => 4, 2370 padding_x => 4,
1957 padding_y => 4, 2371 padding_y => 4,
1958 fg => [1, 1, 1], 2372 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2373 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2374 can_hover => 1,
1961 align => 0, 2375 align => 0,
1962 valign => 0, 2376 valign => 0,
1963 can_events => 1, 2377 can_events => 1,
1964 @_ 2378 @_
… …
1982 2396
1983 glEnable GL_TEXTURE_2D; 2397 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2399 glColor 0, 0, 0, 1;
1986 2400
2401 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2403
1989 glDisable GL_TEXTURE_2D; 2404 glDisable GL_TEXTURE_2D;
1990 2405
1991 $self->SUPER::_draw; 2406 $self->SUPER::_draw;
1992} 2407}
1993 2408
1994############################################################################# 2409#############################################################################
1995 2410
2411package CFPlus::UI::CheckBox;
2412
2413our @ISA = CFPlus::UI::DrawBG::;
2414
2415my @tex =
2416 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2417 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2418
2419use CFPlus::OpenGL;
2420
2421sub new {
2422 my $class = shift;
2423
2424 $class->SUPER::new (
2425 padding_x => 2,
2426 padding_y => 2,
2427 fg => [1, 1, 1],
2428 active_fg => [1, 1, 0],
2429 bg => [0, 0, 0, 0.2],
2430 active_bg => [1, 1, 1, 0.5],
2431 state => 0,
2432 can_hover => 1,
2433 @_
2434 )
2435}
2436
2437sub size_request {
2438 my ($self) = @_;
2439
2440 (6) x 2
2441}
2442
2443sub toggle {
2444 my ($self) = @_;
2445
2446 $self->{state} = !$self->{state};
2447 $self->emit (changed => $self->{state});
2448 $self->update;
2449}
2450
2451sub invoke_button_down {
2452 my ($self, $ev, $x, $y) = @_;
2453
2454 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2455 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2456 $self->toggle;
2457 } else {
2458 return 0
2459 }
2460
2461 1
2462}
2463
2464sub _draw {
2465 my ($self) = @_;
2466
2467 $self->SUPER::_draw;
2468
2469 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2470
2471 my ($w, $h) = @$self{qw(w h)};
2472
2473 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2474
2475 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2476
2477 my $tex = $self->{state} ? $tex[1] : $tex[0];
2478
2479 glEnable GL_TEXTURE_2D;
2480 $tex->draw_quad_alpha (0, 0, $s, $s);
2481 glDisable GL_TEXTURE_2D;
2482}
2483
2484#############################################################################
2485
2486package CFPlus::UI::Image;
2487
2488our @ISA = CFPlus::UI::Base::;
2489
2490use CFPlus::OpenGL;
2491
2492our %texture_cache;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 can_events => 0,
2499 @_,
2500 );
2501
2502 $self->{path} || $self->{tex}
2503 or Carp::croak "'path' or 'tex' attributes required";
2504
2505 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2506 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2507
2508 CFPlus::weaken $texture_cache{$self->{path}};
2509
2510 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2511
2512 $self
2513}
2514
2515sub STORABLE_freeze {
2516 my ($self, $cloning) = @_;
2517
2518 $self->{path}
2519 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2520
2521 $self->{path}
2522}
2523
2524sub STORABLE_attach {
2525 my ($self, $cloning, $path) = @_;
2526
2527 $self->new (path => $path)
2528}
2529
2530sub size_request {
2531 my ($self) = @_;
2532
2533 ($self->{tex}{w}, $self->{tex}{h})
2534}
2535
2536sub _draw {
2537 my ($self) = @_;
2538
2539 my $tex = $self->{tex};
2540
2541 my ($w, $h) = ($self->{w}, $self->{h});
2542
2543 if ($self->{rot90}) {
2544 glRotate 90, 0, 0, 1;
2545 glTranslate 0, -$self->{w}, 0;
2546
2547 ($w, $h) = ($h, $w);
2548 }
2549
2550 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552
2553 $tex->draw_quad (0, 0, $w, $h);
2554
2555 glDisable GL_TEXTURE_2D;
2556}
2557
2558#############################################################################
2559
1996package CFClient::UI::ImageButton; 2560package CFPlus::UI::ImageButton;
1997 2561
1998our @ISA = CFClient::UI::Image::; 2562our @ISA = CFPlus::UI::Image::;
1999 2563
2000use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2001 2565
2002my %textures; 2566my %textures;
2003 2567
2004sub new { 2568sub new {
2005 my $class = shift; 2569 my $class = shift;
… …
2027 1 2591 1
2028} 2592}
2029 2593
2030############################################################################# 2594#############################################################################
2031 2595
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2596package CFPlus::UI::VGauge;
2101 2597
2102our @ISA = CFClient::UI::Base::; 2598our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2599
2163use List::Util qw(min max); 2600use List::Util qw(min max);
2164 2601
2165use CFClient::OpenGL; 2602use CFPlus::OpenGL;
2166 2603
2167my %tex = ( 2604my %tex = (
2168 food => [ 2605 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2606 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2607 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2608 ],
2172 grace => [ 2609 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2610 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2611 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2612 ],
2176 hp => [ 2613 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2614 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2615 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2616 ],
2180 mana => [ 2617 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2619 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2620 ],
2184); 2621);
2185 2622
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2623# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2683 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2684 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2685
2249 my $h1 = $self->{h} * (1 - $ycut1); 2686 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2687 my $h2 = $self->{h} * (1 - $ycut2);
2688 my $h3 = $self->{h};
2689
2690 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2691
2252 glEnable GL_BLEND; 2692 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2693 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2694 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2695 glEnable GL_TEXTURE_2D;
… …
2274 2714
2275 if ($t3) { 2715 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2716 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2717 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2718 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2719 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2720 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2721 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2722 glEnd;
2283 } 2723 }
2284 2724
2285 glDisable GL_BLEND; 2725 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2726 glDisable GL_TEXTURE_2D;
2287} 2727}
2288 2728
2289############################################################################# 2729#############################################################################
2290 2730
2291package CFClient::UI::Gauge; 2731package CFPlus::UI::Gauge;
2292 2732
2293our @ISA = CFClient::UI::VBox::; 2733our @ISA = CFPlus::UI::VBox::;
2294 2734
2295sub new { 2735sub new {
2296 my ($class, %arg) = @_; 2736 my ($class, %arg) = @_;
2297 2737
2298 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2740 can_hover => 1,
2301 can_events => 1, 2741 can_events => 1,
2302 %arg, 2742 %arg,
2303 ); 2743 );
2304 2744
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2745 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2746 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2747 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2748
2309 $self 2749 $self
2310} 2750}
2311 2751
2312sub set_fontsize { 2752sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2773 $self->{value}->set_text ($val);
2334} 2774}
2335 2775
2336############################################################################# 2776#############################################################################
2337 2777
2338package CFClient::UI::Slider; 2778package CFPlus::UI::Slider;
2339 2779
2340use strict; 2780use strict;
2341 2781
2342use CFClient::OpenGL; 2782use CFPlus::OpenGL;
2343 2783
2344our @ISA = CFClient::UI::DrawBG::; 2784our @ISA = CFPlus::UI::DrawBG::;
2345 2785
2346my @tex = 2786my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2787 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2788 qw(s1_slider.png s1_slider_bg.png);
2349 2789
2350sub new { 2790sub new {
2351 my $class = shift; 2791 my $class = shift;
2352 2792
… …
2441 } 2881 }
2442 2882
2443 1 2883 1
2444} 2884}
2445 2885
2886sub invoke_mouse_wheel {
2887 my ($self, $ev) = @_;
2888
2889 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2890
2891 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2892
2893 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2894
2895 ! ! $delta
2896}
2897
2446sub update { 2898sub update {
2447 my ($self) = @_; 2899 my ($self) = @_;
2448 2900
2449 delete $self->{knob_w}; 2901 delete $self->{knob_w};
2450 $self->SUPER::update; 2902 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2949 glDisable GL_TEXTURE_2D;
2498} 2950}
2499 2951
2500############################################################################# 2952#############################################################################
2501 2953
2502package CFClient::UI::ValSlider; 2954package CFPlus::UI::ValSlider;
2503 2955
2504our @ISA = CFClient::UI::HBox::; 2956our @ISA = CFPlus::UI::HBox::;
2505 2957
2506sub new { 2958sub new {
2507 my ($class, %arg) = @_; 2959 my ($class, %arg) = @_;
2508 2960
2509 my $range = delete $arg{range}; 2961 my $range = delete $arg{range};
2510 2962
2511 my $self = $class->SUPER::new ( 2963 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2964 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2965 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2966 to_value => sub { shift },
2515 from_value => sub { shift }, 2967 from_value => sub { shift },
2516 %arg, 2968 %arg,
2517 ); 2969 );
2518 2970
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2990sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2991sub set_value { shift->{slider}->set_value (@_) }
2540 2992
2541############################################################################# 2993#############################################################################
2542 2994
2543package CFClient::UI::TextScroller; 2995package CFPlus::UI::TextScroller;
2544 2996
2545our @ISA = CFClient::UI::HBox::; 2997our @ISA = CFPlus::UI::HBox::;
2546 2998
2547use CFClient::OpenGL; 2999use CFPlus::OpenGL;
2548 3000
2549sub new { 3001sub new {
2550 my $class = shift; 3002 my $class = shift;
2551 3003
2552 my $self = $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
2553 fontsize => 1, 3005 fontsize => 1,
2554 can_events => 0, 3006 can_events => 1,
2555 indent => 0, 3007 indent => 0,
2556 #font => default_font 3008 #font => default_font
2557 @_, 3009 @_,
2558 3010
2559 layout => (new CFClient::Layout 1), 3011 layout => (new CFPlus::Layout),
2560 par => [], 3012 par => [],
3013 max_par => 0,
2561 height => 0, 3014 height => 0,
2562 children => [ 3015 children => [
2563 (new CFClient::UI::Empty expand => 1), 3016 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3017 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3018 ],
2566 ); 3019 );
2567 3020
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3021 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3022
… …
2575 3028
2576 $self->{fontsize} = $fontsize; 3029 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3030 $self->reflow;
2578} 3031}
2579 3032
2580sub visible_children { 3033sub size_request {
2581 my ($self) = @_; 3034 my ($self) = @_;
2582 3035
2583 @{$self->{children}}[0,1] 3036 my ($empty, $slider) = @{ $self->{children} };
3037
3038 local $self->{children} = [$empty, $slider];
3039 $self->SUPER::size_request
2584} 3040}
2585 3041
2586sub invoke_size_allocate { 3042sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3043 my ($self, $w, $h) = @_;
2588 3044
… …
2594 $self->{layout}->set_width ($empty->{w}); 3050 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3051 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3052
2597 $self->reflow; 3053 $self->reflow;
2598 3054
3055 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 3056 $self->SUPER::invoke_size_allocate ($w, $h)
3057}
3058
3059sub invoke_mouse_wheel {
3060 my ($self, $ev) = @_;
3061
3062 return 0 unless $ev->{dy}; # only vertical movements
3063
3064 $self->{children}[1]->emit (mouse_wheel => $ev);
3065
3066 1
2600} 3067}
2601 3068
2602sub get_layout { 3069sub get_layout {
2603 my ($self, $para) = @_; 3070 my ($self, $para) = @_;
2604 3071
… …
2632 3099
2633 # todo: base offset on lines or so, not on pixels 3100 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3101 $self->{children}[1]->set_value ($offset);
2635} 3102}
2636 3103
3104sub current_paragraph {
3105 my ($self) = @_;
3106
3107 $self->{top_paragraph} - 1
3108}
3109
3110sub scroll_to {
3111 my ($self, $para) = @_;
3112
3113 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3114
3115 $self->{scroll_to} = $para;
3116 $self->update;
3117}
3118
2637sub clear { 3119sub clear {
2638 my ($self) = @_; 3120 my ($self) = @_;
2639 3121
2640 my (undef, undef, @other) = @{ $self->{children} }; 3122 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3123 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3126 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3127 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3128}
2647 3129
2648sub add_paragraph { 3130sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3131 my $self = shift;
2650 3132
2651 my ($text, @w) = ref $para ? @$para : $para; 3133 for my $para (@_) {
2652
2653 $para = { 3134 $para = {
3135 fg => [1, 1, 1, 1],
3136 indent => 0,
3137 markup => "",
3138 widget => [],
3139 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3140 w => 1e10,
2655 wrapped => 1, 3141 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3142 };
2661 3143
2662 $self->add (@w) if @w; 3144 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3145 push @{$self->{par}}, $para;
3146 }
3147
3148 if (my $max = $self->{max_par}) {
3149 shift @{$self->{par}} while @{$self->{par}} > $max;
3150 }
2664 3151
2665 $self->{need_reflow}++; 3152 $self->{need_reflow}++;
2666 $self->update; 3153 $self->update;
2667} 3154}
2668 3155
2669sub scroll_to_bottom { 3156sub scroll_to_bottom {
2670 my ($self) = @_; 3157 my ($self) = @_;
2671 3158
2672 $self->{scroll_to_bottom} = 1; 3159 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3160 $self->update;
2674} 3161}
2675 3162
3163sub force_uptodate {
3164 my ($self) = @_;
3165
3166 if (delete $self->{need_reflow}) {
3167 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3168
3169 my $height = 0;
3170
3171 for my $para (@{$self->{par}}) {
3172 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3173 my $layout = $self->get_layout ($para);
3174 my ($w, $h) = $layout->size;
3175
3176 $para->{w} = $w + $para->{indent};
3177 $para->{h} = $h;
3178 $para->{wrapped} = $layout->has_wrapped;
3179 }
3180
3181 $para->{y} = $height;
3182 $height += $para->{h};
3183 }
3184
3185 $self->{height} = $height;
3186 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3187
3188 delete $self->{texture};
3189 }
3190
3191 if (my $paridx = delete $self->{scroll_to}) {
3192 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3193 }
3194}
3195
2676sub update { 3196sub update {
2677 my ($self) = @_; 3197 my ($self) = @_;
2678 3198
2679 $self->SUPER::update; 3199 $self->SUPER::update;
2680 3200
2681 return unless $self->{h} > 0; 3201 return unless $self->{h} > 0;
2682 3202
2683 delete $self->{texture}; 3203 delete $self->{texture};
2684 3204
2685 $ROOT->on_post_alloc ($self => sub { 3205 $ROOT->on_post_alloc ($self => sub {
3206 $self->force_uptodate;
3207
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3208 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3209
2688 if (delete $self->{need_reflow}) {
2689 my $height = 0;
2690
2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2703
2704 $self->{height} = $height;
2705
2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3210 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3211 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3212 glClear GL_COLOR_BUFFER_BIT;
2718 3213
3214 package CFPlus::UI::Base;
3215 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3216 (0, 0, $self->{w}, $self->{h});
3217
3218 my $top = int $self->{children}[1]{range}[0];
3219
3220 my $paridx = 0;
3221 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3222 my $top = int $self->{children}[1]{range}[0];
2720 3223
2721 my $y0 = $top; 3224 my $y0 = $top;
2722 my $y1 = $top + $H; 3225 my $y1 = $top + $H;
2723 3226
2724 my $y = 0;
2725
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 3227 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3228 my $h = $para->{h};
3229 my $y = $para->{y};
2732 3230
2733 if ($y0 < $y + $h && $y < $y1) { 3231 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3232 my $layout = $self->get_layout ($para);
2736 3233
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3234 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3235
2742 if (my @w = @{ $para->{widget} }) { 3236 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3237 my @s = $layout->get_shapes;
2744 3238
2745 for (@w) { 3239 for (@w) {
… …
2751 $_->draw; 3245 $_->draw;
2752 } 3246 }
2753 } 3247 }
2754 } 3248 }
2755 3249
2756 $y += $h; 3250 $paridx++;
3251 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3252 }
2758 3253
2759 glDisable GL_BLEND; 3254 $self->{top_paragraph} = $top_paragraph;
2760 }; 3255 };
2761 }); 3256 });
2762} 3257}
2763 3258
2764sub reconfigure { 3259sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3277 $self->{children}[1]->draw;
2783} 3278}
2784 3279
2785############################################################################# 3280#############################################################################
2786 3281
2787package CFClient::UI::Animator; 3282package CFPlus::UI::Animator;
2788 3283
2789use CFClient::OpenGL; 3284use CFPlus::OpenGL;
2790 3285
2791our @ISA = CFClient::UI::Bin::; 3286our @ISA = CFPlus::UI::Bin::;
2792 3287
2793sub moveto { 3288sub moveto {
2794 my ($self, $x, $y) = @_; 3289 my ($self, $x, $y) = @_;
2795 3290
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3291 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3319 glPopMatrix;
2825} 3320}
2826 3321
2827############################################################################# 3322#############################################################################
2828 3323
2829package CFClient::UI::Flopper; 3324package CFPlus::UI::Flopper;
2830 3325
2831our @ISA = CFClient::UI::Button::; 3326our @ISA = CFPlus::UI::Button::;
2832 3327
2833sub new { 3328sub new {
2834 my $class = shift; 3329 my $class = shift;
2835 3330
2836 my $self = $class->SUPER::new ( 3331 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3343 $self->{other}->toggle_visibility;
2849} 3344}
2850 3345
2851############################################################################# 3346#############################################################################
2852 3347
2853package CFClient::UI::Tooltip; 3348package CFPlus::UI::Tooltip;
2854 3349
2855our @ISA = CFClient::UI::Bin::; 3350our @ISA = CFPlus::UI::Bin::;
2856 3351
2857use CFClient::OpenGL; 3352use CFPlus::OpenGL;
2858 3353
2859sub new { 3354sub new {
2860 my $class = shift; 3355 my $class = shift;
2861 3356
2862 $class->SUPER::new ( 3357 $class->SUPER::new (
… …
2865 ) 3360 )
2866} 3361}
2867 3362
2868sub set_tooltip_from { 3363sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3364 my ($self, $widget) = @_;
3365
3366 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3367 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3368
2871 my $tooltip = $widget->{tooltip}; 3369 my $tooltip = $widget->{tooltip};
2872 3370
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3371 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3372 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3376 }
2879 3377
2880 $tooltip =~ s/^\n+//; 3378 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3379 $tooltip =~ s/\n+$//;
2882 3380
2883 $self->add (new CFClient::UI::Label 3381 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3382 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3383 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3384 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3385 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3386 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3387 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3388 );
2891} 3389}
2892 3390
… …
2911 3409
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3410 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3411 my $widget = $self->{owner}
2914 or return; 3412 or return;
2915 3413
3414 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3415 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3416
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3417 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3418 if $x + $self->{w} > $self->{root}{w};
2920 3419
2921 $self->move_abs ($x, $y); 3420 $self->move_abs ($x, $y);
3421 } else {
3422 $self->hide;
3423 }
2922 }); 3424 });
2923} 3425}
2924 3426
2925sub _draw { 3427sub _draw {
2926 my ($self) = @_; 3428 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3452 $self->SUPER::_draw;
2951} 3453}
2952 3454
2953############################################################################# 3455#############################################################################
2954 3456
2955package CFClient::UI::Face; 3457package CFPlus::UI::Face;
2956 3458
2957our @ISA = CFClient::UI::Base::; 3459our @ISA = CFPlus::UI::DrawBG::;
2958 3460
2959use CFClient::OpenGL; 3461use CFPlus::OpenGL;
2960 3462
2961sub new { 3463sub new {
2962 my $class = shift; 3464 my $class = shift;
2963 3465
2964 my $self = $class->SUPER::new ( 3466 my $self = $class->SUPER::new (
3467 size_w => 32,
3468 size_h => 8,
2965 aspect => 1, 3469 aspect => 1,
2966 can_events => 0, 3470 can_events => 0,
2967 @_, 3471 @_,
2968 ); 3472 );
2969 3473
2970 if ($self->{anim} && $self->{animspeed}) { 3474 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3475 CFPlus::weaken (my $widget = $self);
2972 3476
3477 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3478 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2973 $self->{timer} = Event->timer ( 3479 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3480 parked => 1,
2976 interval => $self->{animspeed},
2977 cb => sub { 3481 cb => sub {
3482 return unless $::CONN && $widget;
3483
2978 ++$widget->{frame}; 3484 ++$widget->{frame};
3485 $widget->update_face;
2979 $widget->update; 3486 $widget->update;
3487
3488 $widget->update_timer;
2980 }, 3489 },
2981 ); 3490 );
3491
3492 $self->update_face;
3493 $self->update_timer;
2982 } 3494 }
2983 3495
2984 $self 3496 $self
2985} 3497}
2986 3498
3499sub update_timer {
3500 my ($self) = @_;
3501
3502 return unless $self->{timer};
3503
3504 if ($self->{visible}) {
3505 $self->{timer}->at (
3506 $self->{anim_start}
3507 + $self->{animspeed}
3508 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3509 );
3510 $self->{timer}->start;
3511 } else {
3512 $self->{timer}->stop;
3513 }
3514}
3515
3516sub update_face {
3517 my ($self) = @_;
3518
3519 return unless $::CONN;
3520
3521 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522 if ($anim && @$anim) {
3523 delete $self->{wait_face};
3524 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3525 }
3526 }
3527}
3528
2987sub size_request { 3529sub size_request {
2988 (32, 8) 3530 my ($self) = @_;
3531
3532 if ($::CONN) {
3533 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3534 if (my $tex = $::CONN->{texture}[$faceid]) {
3535 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3536 } else {
3537 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3538 $self->realloc;
3539 });
3540 }
3541 }
3542 }
3543
3544 ($self->{size_w} || 8, $self->{size_h} || 8)
2989} 3545}
2990 3546
2991sub update { 3547sub update {
2992 my ($self) = @_; 3548 my ($self) = @_;
2993 3549
2994 return unless $self->{visible}; 3550 return unless $self->{visible};
2995 3551
2996 $self->SUPER::update; 3552 $self->SUPER::update;
2997} 3553}
2998 3554
3555sub invoke_visibility_change {
3556 my ($self) = @_;
3557
3558 $self->update_timer;
3559
3560 0
3561}
3562
2999sub _draw { 3563sub _draw {
3000 my ($self) = @_; 3564 my ($self) = @_;
3001 3565
3002 return unless $::CONN; 3566 return unless $::CONN;
3003 3567
3004 my $face; 3568 $self->SUPER::_draw;
3005 3569
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3570 my $faceid = $::CONN->{faceid}[$self->{face}]
3008 3571 or return;
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012 3572
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3573 my $tex = $::CONN->{texture}[$faceid];
3014 3574
3015 if ($tex) { 3575 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3576 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3578 glColor 0, 0, 0, 1;
… …
3022} 3582}
3023 3583
3024sub destroy { 3584sub destroy {
3025 my ($self) = @_; 3585 my ($self) = @_;
3026 3586
3027 $self->{timer}->cancel 3587 (delete $self->{timer})->cancel
3028 if $self->{timer}; 3588 if $self->{timer};
3029 3589
3030 $self->SUPER::destroy; 3590 $self->SUPER::destroy;
3031} 3591}
3032 3592
3033############################################################################# 3593#############################################################################
3034 3594
3035package CFClient::UI::Buttonbar; 3595package CFPlus::UI::Buttonbar;
3036 3596
3037our @ISA = CFClient::UI::HBox::; 3597our @ISA = CFPlus::UI::HBox::;
3038 3598
3039# TODO: should actualyl wrap buttons and other goodies. 3599# TODO: should actually wrap buttons and other goodies.
3040 3600
3041############################################################################# 3601#############################################################################
3042 3602
3043package CFClient::UI::Menu; 3603package CFPlus::UI::Menu;
3044 3604
3045our @ISA = CFClient::UI::FancyFrame::; 3605our @ISA = CFPlus::UI::Toplevel::;
3046 3606
3047use CFClient::OpenGL; 3607use CFPlus::OpenGL;
3048 3608
3049sub new { 3609sub new {
3050 my $class = shift; 3610 my $class = shift;
3051 3611
3052 my $self = $class->SUPER::new ( 3612 my $self = $class->SUPER::new (
3053 items => [], 3613 items => [],
3054 z => 100, 3614 z => 100,
3055 @_, 3615 @_,
3056 ); 3616 );
3057 3617
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3618 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3619
3060 for my $item (@{ $self->{items} }) { 3620 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3621 my ($widget, $cb, $tooltip) = @$item;
3062 3622
3063 # handle various types of items, only text for now 3623 # handle various types of items, only text for now
3064 if (!ref $widget) { 3624 if (!ref $widget) {
3625 if ($widget =~ /\t/) {
3626 my ($left, $right) = split /\t/, $widget, 2;
3627
3065 $widget = new CFClient::UI::Label 3628 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3629 can_hover => 1,
3067 can_events => 1, 3630 can_events => 1,
3631 tooltip => $tooltip,
3632 children => [
3633 (new CFPlus::UI::Label markup => $left, expand => 1),
3634 (new CFPlus::UI::Label markup => $right, align => +1),
3635 ],
3636 ;
3637
3638 } else {
3639 $widget = new CFPlus::UI::Label
3640 can_hover => 1,
3641 can_events => 1,
3068 markup => $widget, 3642 markup => $widget,
3069 tooltip => $tooltip 3643 tooltip => $tooltip;
3644 }
3070 } 3645 }
3071 3646
3072 $self->{item}{$widget} = $item; 3647 $self->{item}{$widget} = $item;
3073 3648
3074 $self->{vbox}->add ($widget); 3649 $self->{vbox}->add ($widget);
… …
3117 1 3692 1
3118} 3693}
3119 3694
3120############################################################################# 3695#############################################################################
3121 3696
3122package CFClient::UI::Multiplexer; 3697package CFPlus::UI::Multiplexer;
3123 3698
3124our @ISA = CFClient::UI::Container::; 3699our @ISA = CFPlus::UI::Container::;
3125 3700
3126sub new { 3701sub new {
3127 my $class = shift; 3702 my $class = shift;
3128 3703
3129 my $self = $class->SUPER::new ( 3704 my $self = $class->SUPER::new (
… …
3143 3718
3144 $self->{current} = $self->{children}[0] 3719 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3720 if @{ $self->{children} };
3146} 3721}
3147 3722
3723sub get_current_page {
3724 my ($self) = @_;
3725
3726 $self->{current}
3727}
3728
3148sub set_current_page { 3729sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3730 my ($self, $page_or_widget) = @_;
3150 3731
3151 my $widget = ref $page_or_widget 3732 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3733 ? $page_or_widget
… …
3184 $self->{current}->draw; 3765 $self->{current}->draw;
3185} 3766}
3186 3767
3187############################################################################# 3768#############################################################################
3188 3769
3189package CFClient::UI::Notebook; 3770package CFPlus::UI::Notebook;
3190 3771
3191our @ISA = CFClient::UI::VBox::; 3772our @ISA = CFPlus::UI::VBox::;
3192 3773
3193sub new { 3774sub new {
3194 my $class = shift; 3775 my $class = shift;
3195 3776
3196 my $self = $class->SUPER::new ( 3777 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3778 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3779 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3780 # filter => # will be put between multiplexer and $self
3200 @_, 3781 @_,
3201 ); 3782 );
3202 3783
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3784 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3788}
3208 3789
3209sub add { 3790sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3791 my ($self, $title, $widget, $tooltip) = @_;
3211 3792
3212 Scalar::Util::weaken $self; 3793 CFPlus::weaken $self;
3213 3794
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3795 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3796 markup => $title,
3216 tooltip => $tooltip, 3797 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3798 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3799 );
3219 3800
3220 $self->{multiplexer}->add ($widget); 3801 $self->{multiplexer}->add ($widget);
3221} 3802}
3222 3803
3804sub get_current_page {
3805 my ($self) = @_;
3806
3807 $self->{multiplexer}->get_current_page
3808}
3809
3223sub set_current_page { 3810sub set_current_page {
3224 my ($self, $page) = @_; 3811 my ($self, $page) = @_;
3225 3812
3226 $self->{multiplexer}->set_current_page ($page); 3813 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3814 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3815}
3229 3816
3230############################################################################# 3817#############################################################################
3231 3818
3232package CFClient::UI::Combobox; 3819package CFPlus::UI::Selector;
3233 3820
3234use utf8; 3821use utf8;
3235 3822
3236our @ISA = CFClient::UI::Button::; 3823our @ISA = CFPlus::UI::Button::;
3237 3824
3238sub new { 3825sub new {
3239 my $class = shift; 3826 my $class = shift;
3240 3827
3241 my $self = $class->SUPER::new ( 3828 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3845 my ($value, $title, $tooltip) = @$_;
3259 3846
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3847 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3848 }
3262 3849
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3850 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3851}
3265 3852
3266sub _set_value { 3853sub _set_value {
3267 my ($self, $value) = @_; 3854 my ($self, $value) = @_;
3268 3855
… …
3283 $self->emit (changed => $value); 3870 $self->emit (changed => $value);
3284} 3871}
3285 3872
3286############################################################################# 3873#############################################################################
3287 3874
3288package CFClient::UI::Statusbox; 3875package CFPlus::UI::Statusbox;
3289 3876
3290our @ISA = CFClient::UI::VBox::; 3877our @ISA = CFPlus::UI::VBox::;
3291 3878
3292sub new { 3879sub new {
3293 my $class = shift; 3880 my $class = shift;
3294 3881
3295 my $self = $class->SUPER::new ( 3882 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3883 fontsize => 0.8,
3297 @_, 3884 @_,
3298 ); 3885 );
3299 3886
3300 Scalar::Util::weaken (my $this = $self); 3887 CFPlus::weaken (my $this = $self);
3301 3888
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3889 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3890
3304 $self 3891 $self
3305} 3892}
… …
3307sub reorder { 3894sub reorder {
3308 my ($self) = @_; 3895 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3896 my $NOW = Time::HiRes::time;
3310 3897
3311 # freeze display when hovering over any label 3898 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3899 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3900 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3901 values %{ $self->{item} };
3315 3902
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3903 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3904 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3905 }
… …
3339 for ($short) { 3926 for ($short) {
3340 s/^\s+//; 3927 s/^\s+//;
3341 s/\s+/ /g; 3928 s/\s+/ /g;
3342 } 3929 }
3343 3930
3344 new CFClient::UI::Label 3931 new CFPlus::UI::Label
3345 markup => $short, 3932 markup => $short,
3346 tooltip => $item->{tooltip}, 3933 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3934 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3935 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3936 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 3990 count => 1,
3404 %arg, 3991 %arg,
3405 }; 3992 };
3406 } 3993 }
3407 3994
3995 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3996 $self->reorder;
3997 });
3409} 3998}
3410 3999
3411sub reconfigure { 4000sub reconfigure {
3412 my ($self) = @_; 4001 my ($self) = @_;
3413 4002
… …
3426 $self->SUPER::destroy; 4015 $self->SUPER::destroy;
3427} 4016}
3428 4017
3429############################################################################# 4018#############################################################################
3430 4019
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root; 4020package CFPlus::UI::Root;
3804 4021
3805our @ISA = CFClient::UI::Container::; 4022our @ISA = CFPlus::UI::Container::;
3806 4023
3807use List::Util qw(min max); 4024use List::Util qw(min max);
3808 4025
3809use CFClient::OpenGL; 4026use CFPlus::OpenGL;
3810 4027
3811sub new { 4028sub new {
3812 my $class = shift; 4029 my $class = shift;
3813 4030
3814 my $self = $class->SUPER::new ( 4031 my $self = $class->SUPER::new (
3815 visible => 1, 4032 visible => 1,
3816 @_, 4033 @_,
3817 ); 4034 );
3818 4035
3819 Scalar::Util::weaken ($self->{root} = $self); 4036 CFPlus::weaken ($self->{root} = $self);
3820 4037
3821 $self 4038 $self
3822} 4039}
3823 4040
3824sub size_request { 4041sub size_request {
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4207 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4208
3992 $w = 0 if $w < 0; 4209 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 4210 $h = 0 if $h < 0;
3994 4211
4212 $w = max $widget->{min_w}, $w;
4213 $h = max $widget->{min_h}, $h;
4214
4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217
4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220
3995 $w = int $w + 0.5; 4221 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4222 $h = int $h + 0.5;
3997 4223
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4225 $widget->{old_w} = $widget->{w};
… …
4009 4235
4010 while ($self->{post_alloc_hook}) { 4236 while ($self->{post_alloc_hook}) {
4011 $_->() 4237 $_->()
4012 for values %{delete $self->{post_alloc_hook}}; 4238 for values %{delete $self->{post_alloc_hook}};
4013 } 4239 }
4014
4015 4240
4016 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4241 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4242 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018 glClear GL_COLOR_BUFFER_BIT; 4243 glClear GL_COLOR_BUFFER_BIT;
4019 4244
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4247 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4248 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4249 glLoadIdentity;
4025 4250
4026 { 4251 {
4027 package CFClient::UI::Base; 4252 package CFPlus::UI::Base;
4028 4253
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4255 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4256
4033 $self->_draw; 4257 $self->_draw;
4258 }
4034} 4259}
4035 4260
4036############################################################################# 4261#############################################################################
4037 4262
4038package CFClient::UI; 4263package CFPlus::UI;
4039 4264
4040$ROOT = new CFClient::UI::Root; 4265$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4266$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4267
40431 42681
4044 4269

Diff Legend

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