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.394 by root, Sat Jul 21 13:54:03 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}
1106
1107#TODO# update range on size_allocate depending on child?
992 1108
993sub add { 1109sub add {
994 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
995 1111
996 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
997} 1113}
998 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
999sub update { 1141sub update {
1000 my ($self) = @_; 1142 my ($self) = @_;
1001 1143
1144 $self->update_slider;
1002 $self->SUPER::update; 1145 $self->SUPER::update;
1146}
1003 1147
1004 # todo: overwrite size_allocate of child 1148sub invoke_mouse_wheel {
1005 my $child = $self->{vp}->child; 1149 my ($self, $ev) = @_;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1150
1151 $self->{vslider}->emit (mouse_wheel => $ev)
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev)
1155 if $ev->{dx};
1156
1157 1
1158}
1159
1160sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_;
1162
1163 if ($ev->{button} == 2) {
1164 $self->grab_focus;
1165
1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1171
1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1175
1176 return 1;
1177 }
1178
1179 0
1180}
1181
1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1184
1185 if (delete $self->{motion}) {
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1007} 1201}
1008 1202
1009sub invoke_size_allocate { 1203sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1011 1205
1012 my $child = $self->{vp}->child; 1206 $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) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1208}
1017 1209
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1210#############################################################################
1022 1211
1023package CFClient::UI::Frame; 1212package CFPlus::UI::Frame;
1024 1213
1025our @ISA = CFClient::UI::Bin::; 1214our @ISA = CFPlus::UI::Bin::;
1026 1215
1027use CFClient::OpenGL; 1216use CFPlus::OpenGL;
1028 1217
1029sub new { 1218sub new {
1030 my $class = shift; 1219 my $class = shift;
1031 1220
1032 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1059} 1248}
1060 1249
1061############################################################################# 1250#############################################################################
1062 1251
1063package CFClient::UI::FancyFrame; 1252package CFPlus::UI::FancyFrame;
1064 1253
1065our @ISA = CFClient::UI::Bin::; 1254our @ISA = CFPlus::UI::Bin::;
1066 1255
1067use CFClient::OpenGL; 1256use CFPlus::OpenGL;
1257
1258sub new {
1259 my ($class, %arg) = @_;
1260
1261 if ((exists $arg{label}) && !ref $arg{label}) {
1262 $arg{label} = new CFPlus::UI::Label
1263 align => 1,
1264 valign => 0,
1265 text => $arg{label},
1266 fontsize => ($arg{border} || 0.8) * 0.75;
1267 }
1268
1269 my $self = $class->SUPER::new (
1270 # label => "",
1271 fg => [0.6, 0.3, 0.1],
1272 border => 0.8,
1273 style => 'single',
1274 %arg,
1275 );
1276
1277 $self
1278}
1279
1280sub add {
1281 my ($self, @widgets) = @_;
1282
1283 $self->SUPER::add (@widgets);
1284 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1285}
1286
1287sub border {
1288 int $_[0]{border} * $::FONTSIZE
1289}
1290
1291sub size_request {
1292 my ($self) = @_;
1293
1294 ($self->{label_w}, undef) = $self->{label}->size_request
1295 if $self->{label};
1296
1297 my ($w, $h) = $self->SUPER::size_request;
1298
1299 (
1300 $w + $self->border * 2,
1301 $h + $self->border * 2,
1302 )
1303}
1304
1305sub invoke_size_allocate {
1306 my ($self, $w, $h) = @_;
1307
1308 my $border = $self->border;
1309
1310 $w -= List::Util::max 0, $border * 2;
1311 $h -= List::Util::max 0, $border * 2;
1312
1313 if (my $label = $self->{label}) {
1314 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1315 $label->{h} = List::Util::min $h, $border;
1316 $label->invoke_size_allocate ($label->{w}, $label->{h});
1317 }
1318
1319 $self->child->configure ($border, $border, $w, $h);
1320
1321 1
1322}
1323
1324sub _draw {
1325 my ($self) = @_;
1326
1327 my $child = $self->{children}[0];
1328
1329 my $border = $self->border;
1330 my ($w, $h) = ($self->{w}, $self->{h});
1331
1332 $child->draw;
1333
1334 glColor @{$self->{fg}};
1335 glBegin GL_LINE_STRIP;
1336 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1337 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1339 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1340 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1341 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1342 glEnd;
1343
1344 if ($self->{label}) {
1345 glTranslate $border * 2, 0;
1346 $self->{label}->_draw;
1347 }
1348}
1349
1350#############################################################################
1351
1352package CFPlus::UI::Toplevel;
1353
1354our @ISA = CFPlus::UI::Bin::;
1355
1356use CFPlus::OpenGL;
1068 1357
1069my $bg = 1358my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1359 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1360 mipmap => 1, wrap => 1;
1072 1361
1073my @border = 1362my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1363 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); 1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1076 1369
1077sub new { 1370sub new {
1078 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1079 1372
1080 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1375 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1376 border => 0.6,
1084 can_events => 1, 1377 can_events => 1,
1085 min_w => 16, 1378 min_w => 64,
1086 min_h => 16, 1379 min_h => 32,
1087 %arg, 1380 %arg,
1088 ); 1381 );
1089 1382
1090 $self->{title_widget} = new CFClient::UI::Label 1383 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1384 align => 0,
1092 valign => 1, 1385 valign => 1,
1093 text => $self->{title}, 1386 text => $self->{title},
1094 fontsize => $self->{border}, 1387 fontsize => $self->{border},
1095 if exists $self->{title}; 1388 if exists $self->{title};
1096 1389
1097 if ($self->{has_close_button}) { 1390 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1391 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1392 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1393 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1394 on_activate => sub { $self->emit ("delete") };
1102 1395
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1396 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1397 }
1105 1398
1106 $self 1399 $self
1107} 1400}
1108 1401
1109sub add { 1402sub add {
1110 my ($self, @widgets) = @_; 1403 my ($self, @widgets) = @_;
1111 1404
1112 $self->SUPER::add (@widgets); 1405 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1406 $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}; 1407 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1408}
1116 1409
1117sub border { 1410sub border {
1118 int $_[0]{border} * $::FONTSIZE 1411 int $_[0]{border} * $::FONTSIZE
1119} 1412}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1445 $self->child->configure ($border, $border, $w, $h);
1153 1446
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1447 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1448 if $self->{close_button};
1156 1449
1450 1
1451}
1452
1453sub invoke_delete {
1454 my ($self) = @_;
1455
1456 $self->hide;
1457
1157 1 1458 1
1158} 1459}
1159 1460
1160sub invoke_button_down { 1461sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1462 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1520 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1521
1221 ! ! $self->{motion} 1522 ! ! $self->{motion}
1222} 1523}
1223 1524
1525sub invoke_visibility_change {
1526 my ($self, $visible) = @_;
1527
1528 delete $self->{motion} unless $visible;
1529
1530 0
1531}
1532
1224sub _draw { 1533sub _draw {
1225 my ($self) = @_; 1534 my ($self) = @_;
1226 1535
1227 my $child = $self->{children}[0]; 1536 my $child = $self->{children}[0];
1228 1537
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1543
1235 my $border = $self->border; 1544 my $border = $self->border;
1236 1545
1237 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1565
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1245 1568
1246 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1588 if $self->{close_button};
1266} 1589}
1267 1590
1268############################################################################# 1591#############################################################################
1269 1592
1270package CFClient::UI::Table; 1593package CFPlus::UI::Table;
1271 1594
1272our @ISA = CFClient::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1273 1596
1274use List::Util qw(max sum); 1597use List::Util qw(max sum);
1275 1598
1276use CFClient::OpenGL; 1599use CFPlus::OpenGL;
1277 1600
1278sub new { 1601sub new {
1279 my $class = shift; 1602 my $class = shift;
1280 1603
1281 $class->SUPER::new ( 1604 $class->SUPER::new (
1282 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1283 @_, 1607 @_,
1284 ) 1608 )
1285} 1609}
1286 1610
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1611sub add {
1292 my ($self, $x, $y, $child) = @_; 1612 my ($self, @widgets) = @_;
1293 1613
1294 $child->set_parent ($self); 1614 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1296 1618
1297 $self->realloc; 1619 $self->SUPER::add (@widgets);
1298} 1620}
1299 1621
1300sub remove { 1622sub add_at {
1623 my $self = shift;
1624
1625 my @widgets;
1626
1627 while (@_) {
1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1629
1630 $child->{row} = $row;
1631 $child->{col} = $col;
1632
1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1301 my ($self, $child) = @_; 1640 my ($self) = @_;
1302 1641
1303 # TODO: not yet implemented 1642 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1643
1310 my @children = $self->children; 1644 my @children = $self->children;
1311 delete $self->{children}; 1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 }
1312 1655 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1656
1318 $self->realloc; 1657 # second pass, rows
1319} 1658 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)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1660
1335 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1665 }
1338 } 1666 }
1339 1667
1340 (\@w, \@h) 1668 (\@w, \@h)
1341} 1669}
… …
1357 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1358 1686
1359 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1361 1689
1362 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1366 1694
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1696
1371 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1372 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1373 1706
1374 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1709
1376 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1712
1380 my $x = 0; 1713 $widget->configure (
1381 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1716 );
1383 for my $c (0 .. $#$row) { 1717 }
1384 my $col_w = $ws->[$c];
1385 1718
1386 if (my $widget = $row->[$c]) { 1719 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1388 }
1389 1721
1390 $x += $col_w; 1722#############################################################################
1723
1724package CFPlus::UI::Fixed;
1725
1726use List::Util qw(min max);
1727
1728our @ISA = CFPlus::UI::Container::;
1729
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) {
1738 my ($mode, $val, $max) = @_;
1739
1740 $mode eq "abs" ? $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743}
1744
1745sub size_request {
1746 my ($self) = @_;
1747
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749
1750 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391 } 1760 }
1761 }
1392 1762
1393 $y += $row_h; 1763 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1;
1765
1766 # now layout remaining widgets
1767 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1769
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1778 }
1779 }
1780
1781 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1;
1783
1784 ($W, $H)
1785}
1786
1787sub invoke_size_allocate {
1788 my ($self, $W, $H) = @_;
1789
1790 for my $child ($self->visible_children) {
1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1792
1793 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $child->configure ($x, $y, $w, $h);
1394 } 1799 }
1395 1800
1396 1 1801 1
1397} 1802}
1398 1803
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############################################################################# 1804#############################################################################
1424 1805
1425package CFClient::UI::Box; 1806package CFPlus::UI::Box;
1426 1807
1427our @ISA = CFClient::UI::Container::; 1808our @ISA = CFPlus::UI::Container::;
1428 1809
1429sub size_request { 1810sub size_request {
1430 my ($self) = @_; 1811 my ($self) = @_;
1431 1812
1432 $self->{vertical} 1813 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1847 for 0 .. $#children;
1467 } 1848 }
1468 } 1849 }
1469 1850
1470 CFClient::UI::harmonize \@req; 1851 CFPlus::UI::harmonize \@req;
1471 1852
1472 my $pos = 0; 1853 my $pos = 0;
1473 for (0 .. $#children) { 1854 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1861 1
1481} 1862}
1482 1863
1483############################################################################# 1864#############################################################################
1484 1865
1485package CFClient::UI::HBox; 1866package CFPlus::UI::HBox;
1486 1867
1487our @ISA = CFClient::UI::Box::; 1868our @ISA = CFPlus::UI::Box::;
1488 1869
1489sub new { 1870sub new {
1490 my $class = shift; 1871 my $class = shift;
1491 1872
1492 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1495 ) 1876 )
1496} 1877}
1497 1878
1498############################################################################# 1879#############################################################################
1499 1880
1500package CFClient::UI::VBox; 1881package CFPlus::UI::VBox;
1501 1882
1502our @ISA = CFClient::UI::Box::; 1883our @ISA = CFPlus::UI::Box::;
1503 1884
1504sub new { 1885sub new {
1505 my $class = shift; 1886 my $class = shift;
1506 1887
1507 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1510 ) 1891 )
1511} 1892}
1512 1893
1513############################################################################# 1894#############################################################################
1514 1895
1515package CFClient::UI::Label; 1896package CFPlus::UI::Label;
1516 1897
1517our @ISA = CFClient::UI::DrawBG::; 1898our @ISA = CFPlus::UI::DrawBG::;
1518 1899
1519use CFClient::OpenGL; 1900use CFPlus::OpenGL;
1520 1901
1521sub new { 1902sub new {
1522 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1523 1904
1524 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1908 #active_bg => none
1528 #font => default_font 1909 #font => default_font
1529 #text => initial text 1910 #text => initial text
1530 #markup => initial narkup 1911 #markup => initial narkup
1531 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1913 #style => 0, # render flags
1532 ellipsise => 3, # end 1914 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1915 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1916 fontsize => 1,
1535 align => -1, 1917 align => -1,
1536 valign => -1, 1918 valign => -1,
1537 padding_x => 2, 1919 padding_x => 2,
1538 padding_y => 2, 1920 padding_y => 2,
1539 can_events => 0, 1921 can_events => 0,
1540 %arg 1922 %arg
1541 ); 1923 );
1542 1924
1543 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1926 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1928 $self->{template} = $layout;
1547 } 1929 }
1548 1930
1549 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1553 } 1935 }
1554 1936
1555 $self 1937 $self
1556} 1938}
1557 1939
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1940sub update {
1569 my ($self) = @_; 1941 my ($self) = @_;
1570 1942
1571 delete $self->{texture}; 1943 delete $self->{texture};
1572 $self->SUPER::update; 1944 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1955 my ($self, $text) = @_;
1584 1956
1585 return if $self->{text} eq "T$text"; 1957 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1958 $self->{text} = "T$text";
1587 1959
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1960 $self->{layout}->set_text ($text);
1590 1961
1591 delete $self->{size_req}; 1962 delete $self->{size_req};
1592 $self->realloc; 1963 $self->realloc;
1593 $self->update; 1964 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1970 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1971 $self->{text} = "M$markup";
1601 1972
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1973 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1974
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1975 $self->{layout}->set_markup ($markup);
1606 1976
1607 delete $self->{size_req}; 1977 delete $self->{size_req};
1608 $self->realloc; 1978 $self->realloc;
1609 $self->update; 1979 $self->update;
… …
1621 1991
1622 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1623 1993
1624 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1996 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1998
1628 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1629 2000
1630 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
… …
1654 2025
1655sub set_fontsize { 2026sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2027 my ($self, $fontsize) = @_;
1657 2028
1658 $self->{fontsize} = $fontsize; 2029 $self->{fontsize} = $fontsize;
2030 delete $self->{size_req};
1659 delete $self->{texture}; 2031 delete $self->{texture};
1660 2032
1661 $self->realloc; 2033 $self->realloc;
1662} 2034}
1663 2035
1664sub reconfigure { 2036sub reconfigure {
1665 my ($self) = @_; 2037 my ($self) = @_;
1666 2038
1667 delete $self->{size_req}; 2039 delete $self->{size_req};
2040 delete $self->{texture};
1668 2041
1669 $self->SUPER::reconfigure; 2042 $self->SUPER::reconfigure;
1670} 2043}
1671 2044
1672sub _draw { 2045sub _draw {
1673 my ($self) = @_; 2046 my ($self) = @_;
1674 2047
1675 $self->SUPER::_draw; # draw background, if applicable 2048 $self->SUPER::_draw; # draw background, if applicable
1676 2049
1677 my $tex = $self->{texture} ||= do { 2050 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2051 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2052 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2053 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2054 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2055 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2056 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2057
1685 new_from_layout CFClient::Texture $self->{layout} 2058 [$self->{layout}->size]
1686 }; 2059 };
1687 2060
1688 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2063 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2064 : ($self->{w} - $size->[0]) * 0.5);
1692 2065
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2068 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2069 };
1697 2070
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2071 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2072 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2073
1703 if ($tex->{format} == GL_ALPHA) { 2074 $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} 2075}
1714 2076
1715############################################################################# 2077#############################################################################
1716 2078
1717package CFClient::UI::EntryBase; 2079package CFPlus::UI::EntryBase;
1718 2080
1719our @ISA = CFClient::UI::Label::; 2081our @ISA = CFPlus::UI::Label::;
1720 2082
1721use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1722 2084
1723sub new { 2085sub new {
1724 my $class = shift; 2086 my $class = shift;
1725 2087
1726 $class->SUPER::new ( 2088 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2092 active_fg => [0, 0, 0],
1731 can_hover => 1, 2093 can_hover => 1,
1732 can_focus => 1, 2094 can_focus => 1,
1733 valign => 0, 2095 valign => 0,
1734 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1735 #text => ... 2098 #text => ...
1736 #hidden => "*", 2099 #hidden => "*",
1737 @_ 2100 @_
1738 ) 2101 )
1739} 2102}
… …
1784 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1786 2149
1787 my $text = $self->get_text; 2150 my $text = $self->get_text;
1788 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1789 if ($uni == 8) { 2154 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1798 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2178 $self->emit ('escape');
1803 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2183 } else {
1806 return 0; 2184 return 0;
1807 } 2185 }
1808 2186
1809 $self->_set_text ($text); 2187 $self->_set_text ($text);
1810 2188
1811 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1812 2191
1813 1 2192 1
1814} 2193}
1815 2194
1816sub invoke_focus_in { 2195sub invoke_focus_in {
… …
1828 2207
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2209
1831 # byte-index to char-index 2210 # byte-index to char-index
1832 my $text = $self->{text}; 2211 my $text = $self->{text};
1833 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1835 2214
1836 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1837 $self->update; 2216 $self->update;
1838 2217
1839 1 2218 1
… …
1878 utf8::encode $text; 2257 utf8::encode $text;
1879 2258
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2260 }
1882 2261
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2262 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2263 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}; 2264 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2265 glEnd;
1888 } 2266 }
1889} 2267}
1890 2268
2269#############################################################################
2270
1891package CFClient::UI::Entry; 2271package CFPlus::UI::Entry;
1892 2272
1893our @ISA = CFClient::UI::EntryBase::; 2273our @ISA = CFPlus::UI::EntryBase::;
1894 2274
1895use CFClient::OpenGL; 2275use CFPlus::OpenGL;
1896 2276
1897sub invoke_key_down { 2277sub invoke_key_down {
1898 my ($self, $ev) = @_; 2278 my ($self, $ev) = @_;
1899 2279
1900 my $sym = $ev->{sym}; 2280 my $sym = $ev->{sym};
1901 2281
1902 if ($sym == 13) { 2282 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2283 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2284 my $txt = $self->get_text;
1905 2285
1906 $self->{history_pointer} = -1; 2286 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2287 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2288 $self->emit (activate => $txt);
1909 $self->update; 2289 $self->update;
1910 2290
1911 } elsif ($sym == CFClient::SDLK_UP) { 2291 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2292 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2293 $self->{history_saveback} = $self->get_text;
1914 } 2294 }
1915 if (@{$self->{history} || []} > 0) { 2295 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2296 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2298 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2299 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2300 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2301 }
1922 2302
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2303 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2304 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2305 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2306
1927 if ($self->{history_pointer} >= 0) { 2307 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2308 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2317 1
1938} 2318}
1939 2319
1940############################################################################# 2320#############################################################################
1941 2321
2322package CFPlus::UI::TextEdit;
2323
2324our @ISA = CFPlus::UI::EntryBase::;
2325
2326use CFPlus::OpenGL;
2327
2328sub move_cursor_ver {
2329 my ($self, $dy) = @_;
2330
2331 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2332
2333 $y += $dy;
2334
2335 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2336 $self->{cursor} = $index;
2337 delete $self->{cur_h};
2338 $self->update;
2339 return;
2340 }
2341}
2342
2343sub invoke_key_down {
2344 my ($self, $ev) = @_;
2345
2346 my $sym = $ev->{sym};
2347
2348 if ($sym == CFPlus::SDLK_UP) {
2349 $self->move_cursor_ver (-1);
2350 } elsif ($sym == CFPlus::SDLK_DOWN) {
2351 $self->move_cursor_ver (+1);
2352 } else {
2353 return $self->SUPER::invoke_key_down ($ev)
2354 }
2355
2356 1
2357}
2358
2359#############################################################################
2360
1942package CFClient::UI::Button; 2361package CFPlus::UI::Button;
1943 2362
1944our @ISA = CFClient::UI::Label::; 2363our @ISA = CFPlus::UI::Label::;
1945 2364
1946use CFClient::OpenGL; 2365use CFPlus::OpenGL;
1947 2366
1948my @tex = 2367my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
1951 2370
1952sub new { 2371sub new {
1953 my $class = shift; 2372 my $class = shift;
1954 2373
1955 $class->SUPER::new ( 2374 $class->SUPER::new (
1956 padding_x => 4, 2375 padding_x => 4,
1957 padding_y => 4, 2376 padding_y => 4,
1958 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2379 can_hover => 1,
1961 align => 0, 2380 align => 0,
1962 valign => 0, 2381 valign => 0,
1963 can_events => 1, 2382 can_events => 1,
1964 @_ 2383 @_
… …
1982 2401
1983 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
1986 2405
2406 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2408
1989 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1990 2410
1991 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
1992} 2412}
1993 2413
1994############################################################################# 2414#############################################################################
1995 2415
2416package CFPlus::UI::CheckBox;
2417
2418our @ISA = CFPlus::UI::DrawBG::;
2419
2420my @tex =
2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2422 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2423
2424use CFPlus::OpenGL;
2425
2426sub new {
2427 my $class = shift;
2428
2429 $class->SUPER::new (
2430 padding_x => 2,
2431 padding_y => 2,
2432 fg => [1, 1, 1],
2433 active_fg => [1, 1, 0],
2434 bg => [0, 0, 0, 0.2],
2435 active_bg => [1, 1, 1, 0.5],
2436 state => 0,
2437 can_hover => 1,
2438 @_
2439 )
2440}
2441
2442sub size_request {
2443 my ($self) = @_;
2444
2445 (6) x 2
2446}
2447
2448sub toggle {
2449 my ($self) = @_;
2450
2451 $self->{state} = !$self->{state};
2452 $self->emit (changed => $self->{state});
2453 $self->update;
2454}
2455
2456sub invoke_button_down {
2457 my ($self, $ev, $x, $y) = @_;
2458
2459 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2460 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2461 $self->toggle;
2462 } else {
2463 return 0
2464 }
2465
2466 1
2467}
2468
2469sub _draw {
2470 my ($self) = @_;
2471
2472 $self->SUPER::_draw;
2473
2474 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2475
2476 my ($w, $h) = @$self{qw(w h)};
2477
2478 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2479
2480 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2481
2482 my $tex = $self->{state} ? $tex[1] : $tex[0];
2483
2484 glEnable GL_TEXTURE_2D;
2485 $tex->draw_quad_alpha (0, 0, $s, $s);
2486 glDisable GL_TEXTURE_2D;
2487}
2488
2489#############################################################################
2490
2491package CFPlus::UI::Image;
2492
2493our @ISA = CFPlus::UI::Base::;
2494
2495use CFPlus::OpenGL;
2496
2497our %texture_cache;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my $self = $class->SUPER::new (
2503 can_events => 0,
2504 @_,
2505 );
2506
2507 $self->{path} || $self->{tex}
2508 or Carp::croak "'path' or 'tex' attributes required";
2509
2510 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2511 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2512
2513 CFPlus::weaken $texture_cache{$self->{path}};
2514
2515 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2516
2517 $self
2518}
2519
2520sub STORABLE_freeze {
2521 my ($self, $cloning) = @_;
2522
2523 $self->{path}
2524 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2525
2526 $self->{path}
2527}
2528
2529sub STORABLE_attach {
2530 my ($self, $cloning, $path) = @_;
2531
2532 $self->new (path => $path)
2533}
2534
2535sub size_request {
2536 my ($self) = @_;
2537
2538 ($self->{tex}{w}, $self->{tex}{h})
2539}
2540
2541sub _draw {
2542 my ($self) = @_;
2543
2544 my $tex = $self->{tex};
2545
2546 my ($w, $h) = ($self->{w}, $self->{h});
2547
2548 if ($self->{rot90}) {
2549 glRotate 90, 0, 0, 1;
2550 glTranslate 0, -$self->{w}, 0;
2551
2552 ($w, $h) = ($h, $w);
2553 }
2554
2555 glEnable GL_TEXTURE_2D;
2556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2557
2558 $tex->draw_quad (0, 0, $w, $h);
2559
2560 glDisable GL_TEXTURE_2D;
2561}
2562
2563#############################################################################
2564
1996package CFClient::UI::ImageButton; 2565package CFPlus::UI::ImageButton;
1997 2566
1998our @ISA = CFClient::UI::Image::; 2567our @ISA = CFPlus::UI::Image::;
1999 2568
2000use CFClient::OpenGL; 2569use CFPlus::OpenGL;
2001 2570
2002my %textures; 2571my %textures;
2003 2572
2004sub new { 2573sub new {
2005 my $class = shift; 2574 my $class = shift;
… …
2027 1 2596 1
2028} 2597}
2029 2598
2030############################################################################# 2599#############################################################################
2031 2600
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; 2601package CFPlus::UI::VGauge;
2101 2602
2102our @ISA = CFClient::UI::Base::; 2603our @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 2604
2163use List::Util qw(min max); 2605use List::Util qw(min max);
2164 2606
2165use CFClient::OpenGL; 2607use CFPlus::OpenGL;
2166 2608
2167my %tex = ( 2609my %tex = (
2168 food => [ 2610 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2612 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2613 ],
2172 grace => [ 2614 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 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/ 2616 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2617 ],
2176 hp => [ 2618 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2620 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2621 ],
2180 mana => [ 2622 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2623 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/ 2624 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2625 ],
2184); 2626);
2185 2627
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2628# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2688 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2689 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2690
2249 my $h1 = $self->{h} * (1 - $ycut1); 2691 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2692 my $h2 = $self->{h} * (1 - $ycut2);
2693 my $h3 = $self->{h};
2694
2695 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2696
2252 glEnable GL_BLEND; 2697 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2698 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2699 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2700 glEnable GL_TEXTURE_2D;
… …
2274 2719
2275 if ($t3) { 2720 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2721 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2722 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2723 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2724 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2725 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2726 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2727 glEnd;
2283 } 2728 }
2284 2729
2285 glDisable GL_BLEND; 2730 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2731 glDisable GL_TEXTURE_2D;
2287} 2732}
2288 2733
2289############################################################################# 2734#############################################################################
2290 2735
2291package CFClient::UI::Gauge; 2736package CFPlus::UI::Gauge;
2292 2737
2293our @ISA = CFClient::UI::VBox::; 2738our @ISA = CFPlus::UI::VBox::;
2294 2739
2295sub new { 2740sub new {
2296 my ($class, %arg) = @_; 2741 my ($class, %arg) = @_;
2297 2742
2298 my $self = $class->SUPER::new ( 2743 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2745 can_hover => 1,
2301 can_events => 1, 2746 can_events => 1,
2302 %arg, 2747 %arg,
2303 ); 2748 );
2304 2749
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2750 $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); 2751 $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"); 2752 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2753
2309 $self 2754 $self
2310} 2755}
2311 2756
2312sub set_fontsize { 2757sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2778 $self->{value}->set_text ($val);
2334} 2779}
2335 2780
2336############################################################################# 2781#############################################################################
2337 2782
2338package CFClient::UI::Slider; 2783package CFPlus::UI::Slider;
2339 2784
2340use strict; 2785use strict;
2341 2786
2342use CFClient::OpenGL; 2787use CFPlus::OpenGL;
2343 2788
2344our @ISA = CFClient::UI::DrawBG::; 2789our @ISA = CFPlus::UI::DrawBG::;
2345 2790
2346my @tex = 2791my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2792 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2793 qw(s1_slider.png s1_slider_bg.png);
2349 2794
2350sub new { 2795sub new {
2351 my $class = shift; 2796 my $class = shift;
2352 2797
… …
2441 } 2886 }
2442 2887
2443 1 2888 1
2444} 2889}
2445 2890
2891sub invoke_mouse_wheel {
2892 my ($self, $ev) = @_;
2893
2894 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2895
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897
2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2899
2900 ! ! $delta
2901}
2902
2446sub update { 2903sub update {
2447 my ($self) = @_; 2904 my ($self) = @_;
2448 2905
2449 delete $self->{knob_w}; 2906 delete $self->{knob_w};
2450 $self->SUPER::update; 2907 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2954 glDisable GL_TEXTURE_2D;
2498} 2955}
2499 2956
2500############################################################################# 2957#############################################################################
2501 2958
2502package CFClient::UI::ValSlider; 2959package CFPlus::UI::ValSlider;
2503 2960
2504our @ISA = CFClient::UI::HBox::; 2961our @ISA = CFPlus::UI::HBox::;
2505 2962
2506sub new { 2963sub new {
2507 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2508 2965
2509 my $range = delete $arg{range}; 2966 my $range = delete $arg{range};
2510 2967
2511 my $self = $class->SUPER::new ( 2968 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2969 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2970 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2971 to_value => sub { shift },
2515 from_value => sub { shift }, 2972 from_value => sub { shift },
2516 %arg, 2973 %arg,
2517 ); 2974 );
2518 2975
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2995sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2996sub set_value { shift->{slider}->set_value (@_) }
2540 2997
2541############################################################################# 2998#############################################################################
2542 2999
2543package CFClient::UI::TextScroller; 3000package CFPlus::UI::TextScroller;
2544 3001
2545our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2546 3003
2547use CFClient::OpenGL; 3004use CFPlus::OpenGL;
2548 3005
2549sub new { 3006sub new {
2550 my $class = shift; 3007 my $class = shift;
2551 3008
2552 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2553 fontsize => 1, 3010 fontsize => 1,
2554 can_events => 0, 3011 can_events => 1,
2555 indent => 0, 3012 indent => 0,
2556 #font => default_font 3013 #font => default_font
2557 @_, 3014 @_,
2558 3015
2559 layout => (new CFClient::Layout 1), 3016 layout => (new CFPlus::Layout),
2560 par => [], 3017 par => [],
3018 max_par => 0,
2561 height => 0, 3019 height => 0,
2562 children => [ 3020 children => [
2563 (new CFClient::UI::Empty expand => 1), 3021 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3022 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3023 ],
2566 ); 3024 );
2567 3025
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3026 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3027
… …
2575 3033
2576 $self->{fontsize} = $fontsize; 3034 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3035 $self->reflow;
2578} 3036}
2579 3037
2580sub visible_children { 3038sub size_request {
2581 my ($self) = @_; 3039 my ($self) = @_;
2582 3040
2583 @{$self->{children}}[0,1] 3041 my ($empty, $slider) = @{ $self->{children} };
3042
3043 local $self->{children} = [$empty, $slider];
3044 $self->SUPER::size_request
2584} 3045}
2585 3046
2586sub invoke_size_allocate { 3047sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3048 my ($self, $w, $h) = @_;
2588 3049
… …
2594 $self->{layout}->set_width ($empty->{w}); 3055 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3056 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3057
2597 $self->reflow; 3058 $self->reflow;
2598 3059
3060 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 3061 $self->SUPER::invoke_size_allocate ($w, $h)
3062}
3063
3064sub invoke_mouse_wheel {
3065 my ($self, $ev) = @_;
3066
3067 return 0 unless $ev->{dy}; # only vertical movements
3068
3069 $self->{children}[1]->emit (mouse_wheel => $ev);
3070
3071 1
2600} 3072}
2601 3073
2602sub get_layout { 3074sub get_layout {
2603 my ($self, $para) = @_; 3075 my ($self, $para) = @_;
2604 3076
… …
2632 3104
2633 # todo: base offset on lines or so, not on pixels 3105 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3106 $self->{children}[1]->set_value ($offset);
2635} 3107}
2636 3108
3109sub current_paragraph {
3110 my ($self) = @_;
3111
3112 $self->{top_paragraph} - 1
3113}
3114
3115sub scroll_to {
3116 my ($self, $para) = @_;
3117
3118 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3119
3120 $self->{scroll_to} = $para;
3121 $self->update;
3122}
3123
2637sub clear { 3124sub clear {
2638 my ($self) = @_; 3125 my ($self) = @_;
2639 3126
2640 my (undef, undef, @other) = @{ $self->{children} }; 3127 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3128 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3131 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3132 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3133}
2647 3134
2648sub add_paragraph { 3135sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3136 my $self = shift;
2650 3137
2651 my ($text, @w) = ref $para ? @$para : $para; 3138 for my $para (@_) {
2652
2653 $para = { 3139 $para = {
3140 fg => [1, 1, 1, 1],
3141 indent => 0,
3142 markup => "",
3143 widget => [],
3144 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3145 w => 1e10,
2655 wrapped => 1, 3146 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3147 };
2661 3148
2662 $self->add (@w) if @w; 3149 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3150 push @{$self->{par}}, $para;
3151 }
3152
3153 if (my $max = $self->{max_par}) {
3154 shift @{$self->{par}} while @{$self->{par}} > $max;
3155 }
2664 3156
2665 $self->{need_reflow}++; 3157 $self->{need_reflow}++;
2666 $self->update; 3158 $self->update;
2667} 3159}
2668 3160
2669sub scroll_to_bottom { 3161sub scroll_to_bottom {
2670 my ($self) = @_; 3162 my ($self) = @_;
2671 3163
2672 $self->{scroll_to_bottom} = 1; 3164 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3165 $self->update;
2674} 3166}
2675 3167
3168sub force_uptodate {
3169 my ($self) = @_;
3170
3171 if (delete $self->{need_reflow}) {
3172 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3173
3174 my $height = 0;
3175
3176 for my $para (@{$self->{par}}) {
3177 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3178 my $layout = $self->get_layout ($para);
3179 my ($w, $h) = $layout->size;
3180
3181 $para->{w} = $w + $para->{indent};
3182 $para->{h} = $h;
3183 $para->{wrapped} = $layout->has_wrapped;
3184 }
3185
3186 $para->{y} = $height;
3187 $height += $para->{h};
3188 }
3189
3190 $self->{height} = $height;
3191 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3192
3193 delete $self->{texture};
3194 }
3195
3196 if (my $paridx = delete $self->{scroll_to}) {
3197 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3198 }
3199}
3200
2676sub update { 3201sub update {
2677 my ($self) = @_; 3202 my ($self) = @_;
2678 3203
2679 $self->SUPER::update; 3204 $self->SUPER::update;
2680 3205
2681 return unless $self->{h} > 0; 3206 return unless $self->{h} > 0;
2682 3207
2683 delete $self->{texture}; 3208 delete $self->{texture};
2684 3209
2685 $ROOT->on_post_alloc ($self => sub { 3210 $ROOT->on_post_alloc ($self => sub {
3211 $self->force_uptodate;
3212
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3214
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 { 3215 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3216 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3217 glClear GL_COLOR_BUFFER_BIT;
2718 3218
3219 package CFPlus::UI::Base;
3220 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3221 (0, 0, $self->{w}, $self->{h});
3222
3223 my $top = int $self->{children}[1]{range}[0];
3224
3225 my $paridx = 0;
3226 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3227 my $top = int $self->{children}[1]{range}[0];
2720 3228
2721 my $y0 = $top; 3229 my $y0 = $top;
2722 my $y1 = $top + $H; 3230 my $y1 = $top + $H;
2723 3231
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}}) { 3232 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3233 my $h = $para->{h};
3234 my $y = $para->{y};
2732 3235
2733 if ($y0 < $y + $h && $y < $y1) { 3236 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3237 my $layout = $self->get_layout ($para);
2736 3238
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3239 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3240
2742 if (my @w = @{ $para->{widget} }) { 3241 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3242 my @s = $layout->get_shapes;
2744 3243
2745 for (@w) { 3244 for (@w) {
… …
2751 $_->draw; 3250 $_->draw;
2752 } 3251 }
2753 } 3252 }
2754 } 3253 }
2755 3254
2756 $y += $h; 3255 $paridx++;
3256 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3257 }
2758 3258
2759 glDisable GL_BLEND; 3259 $self->{top_paragraph} = $top_paragraph;
2760 }; 3260 };
2761 }); 3261 });
2762} 3262}
2763 3263
2764sub reconfigure { 3264sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3282 $self->{children}[1]->draw;
2783} 3283}
2784 3284
2785############################################################################# 3285#############################################################################
2786 3286
2787package CFClient::UI::Animator; 3287package CFPlus::UI::Animator;
2788 3288
2789use CFClient::OpenGL; 3289use CFPlus::OpenGL;
2790 3290
2791our @ISA = CFClient::UI::Bin::; 3291our @ISA = CFPlus::UI::Bin::;
2792 3292
2793sub moveto { 3293sub moveto {
2794 my ($self, $x, $y) = @_; 3294 my ($self, $x, $y) = @_;
2795 3295
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3296 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3324 glPopMatrix;
2825} 3325}
2826 3326
2827############################################################################# 3327#############################################################################
2828 3328
2829package CFClient::UI::Flopper; 3329package CFPlus::UI::Flopper;
2830 3330
2831our @ISA = CFClient::UI::Button::; 3331our @ISA = CFPlus::UI::Button::;
2832 3332
2833sub new { 3333sub new {
2834 my $class = shift; 3334 my $class = shift;
2835 3335
2836 my $self = $class->SUPER::new ( 3336 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3348 $self->{other}->toggle_visibility;
2849} 3349}
2850 3350
2851############################################################################# 3351#############################################################################
2852 3352
2853package CFClient::UI::Tooltip; 3353package CFPlus::UI::Tooltip;
2854 3354
2855our @ISA = CFClient::UI::Bin::; 3355our @ISA = CFPlus::UI::Bin::;
2856 3356
2857use CFClient::OpenGL; 3357use CFPlus::OpenGL;
2858 3358
2859sub new { 3359sub new {
2860 my $class = shift; 3360 my $class = shift;
2861 3361
2862 $class->SUPER::new ( 3362 $class->SUPER::new (
… …
2865 ) 3365 )
2866} 3366}
2867 3367
2868sub set_tooltip_from { 3368sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3369 my ($self, $widget) = @_;
3370
3371 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3372 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3373
2871 my $tooltip = $widget->{tooltip}; 3374 my $tooltip = $widget->{tooltip};
2872 3375
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3376 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3377 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3381 }
2879 3382
2880 $tooltip =~ s/^\n+//; 3383 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3384 $tooltip =~ s/\n+$//;
2882 3385
2883 $self->add (new CFClient::UI::Label 3386 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3387 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3388 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3389 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3390 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3391 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3392 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3393 );
2891} 3394}
2892 3395
… …
2911 3414
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3415 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3416 my $widget = $self->{owner}
2914 or return; 3417 or return;
2915 3418
3419 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3420 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3421
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3422 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3423 if $x + $self->{w} > $self->{root}{w};
2920 3424
2921 $self->move_abs ($x, $y); 3425 $self->move_abs ($x, $y);
3426 } else {
3427 $self->hide;
3428 }
2922 }); 3429 });
2923} 3430}
2924 3431
2925sub _draw { 3432sub _draw {
2926 my ($self) = @_; 3433 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3457 $self->SUPER::_draw;
2951} 3458}
2952 3459
2953############################################################################# 3460#############################################################################
2954 3461
2955package CFClient::UI::Face; 3462package CFPlus::UI::Face;
2956 3463
2957our @ISA = CFClient::UI::Base::; 3464our @ISA = CFPlus::UI::DrawBG::;
2958 3465
2959use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2960 3467
2961sub new { 3468sub new {
2962 my $class = shift; 3469 my $class = shift;
2963 3470
2964 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
2965 aspect => 1, 3474 aspect => 1,
2966 can_events => 0, 3475 can_events => 0,
2967 @_, 3476 @_,
2968 ); 3477 );
2969 3478
2970 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
2972 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2973 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3485 parked => 1,
2976 interval => $self->{animspeed},
2977 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
2978 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
2979 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
2980 }, 3494 },
2981 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
2982 } 3499 }
2983 3500
2984 $self 3501 $self
2985} 3502}
2986 3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3519}
3520
3521sub update_face {
3522 my ($self) = @_;
3523
3524 return unless $::CONN;
3525
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) {
3528 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3530 }
3531 }
3532}
3533
2987sub size_request { 3534sub size_request {
2988 (32, 8) 3535 my ($self) = @_;
3536
3537 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc;
3544 });
3545 }
3546 }
3547 }
3548
3549 ($self->{size_w} || 8, $self->{size_h} || 8)
2989} 3550}
2990 3551
2991sub update { 3552sub update {
2992 my ($self) = @_; 3553 my ($self) = @_;
2993 3554
2994 return unless $self->{visible}; 3555 return unless $self->{visible};
2995 3556
2996 $self->SUPER::update; 3557 $self->SUPER::update;
2997} 3558}
2998 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
2999sub _draw { 3568sub _draw {
3000 my ($self) = @_; 3569 my ($self) = @_;
3001 3570
3002 return unless $::CONN; 3571 return unless $::CONN;
3003 3572
3004 my $face; 3573 $self->SUPER::_draw;
3005 3574
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
3008 3576 or return;
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012 3577
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
3014 3579
3015 if ($tex) { 3580 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
… …
3022} 3587}
3023 3588
3024sub destroy { 3589sub destroy {
3025 my ($self) = @_; 3590 my ($self) = @_;
3026 3591
3027 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3028 if $self->{timer}; 3593 if $self->{timer};
3029 3594
3030 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3031} 3596}
3032 3597
3033############################################################################# 3598#############################################################################
3034 3599
3035package CFClient::UI::Buttonbar; 3600package CFPlus::UI::Buttonbar;
3036 3601
3037our @ISA = CFClient::UI::HBox::; 3602our @ISA = CFPlus::UI::HBox::;
3038 3603
3039# TODO: should actualyl wrap buttons and other goodies. 3604# TODO: should actually wrap buttons and other goodies.
3040 3605
3041############################################################################# 3606#############################################################################
3042 3607
3043package CFClient::UI::Menu; 3608package CFPlus::UI::Menu;
3044 3609
3045our @ISA = CFClient::UI::FancyFrame::; 3610our @ISA = CFPlus::UI::Toplevel::;
3046 3611
3047use CFClient::OpenGL; 3612use CFPlus::OpenGL;
3048 3613
3049sub new { 3614sub new {
3050 my $class = shift; 3615 my $class = shift;
3051 3616
3052 my $self = $class->SUPER::new ( 3617 my $self = $class->SUPER::new (
3053 items => [], 3618 items => [],
3054 z => 100, 3619 z => 100,
3055 @_, 3620 @_,
3056 ); 3621 );
3057 3622
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3624
3060 for my $item (@{ $self->{items} }) { 3625 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3626 my ($widget, $cb, $tooltip) = @$item;
3062 3627
3063 # handle various types of items, only text for now 3628 # handle various types of items, only text for now
3064 if (!ref $widget) { 3629 if (!ref $widget) {
3630 if ($widget =~ /\t/) {
3631 my ($left, $right) = split /\t/, $widget, 2;
3632
3065 $widget = new CFClient::UI::Label 3633 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3634 can_hover => 1,
3067 can_events => 1, 3635 can_events => 1,
3636 tooltip => $tooltip,
3637 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ],
3641 ;
3642
3643 } else {
3644 $widget = new CFPlus::UI::Label
3645 can_hover => 1,
3646 can_events => 1,
3068 markup => $widget, 3647 markup => $widget,
3069 tooltip => $tooltip 3648 tooltip => $tooltip;
3649 }
3070 } 3650 }
3071 3651
3072 $self->{item}{$widget} = $item; 3652 $self->{item}{$widget} = $item;
3073 3653
3074 $self->{vbox}->add ($widget); 3654 $self->{vbox}->add ($widget);
… …
3117 1 3697 1
3118} 3698}
3119 3699
3120############################################################################# 3700#############################################################################
3121 3701
3122package CFClient::UI::Multiplexer; 3702package CFPlus::UI::Multiplexer;
3123 3703
3124our @ISA = CFClient::UI::Container::; 3704our @ISA = CFPlus::UI::Container::;
3125 3705
3126sub new { 3706sub new {
3127 my $class = shift; 3707 my $class = shift;
3128 3708
3129 my $self = $class->SUPER::new ( 3709 my $self = $class->SUPER::new (
… …
3143 3723
3144 $self->{current} = $self->{children}[0] 3724 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3725 if @{ $self->{children} };
3146} 3726}
3147 3727
3728sub get_current_page {
3729 my ($self) = @_;
3730
3731 $self->{current}
3732}
3733
3148sub set_current_page { 3734sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3735 my ($self, $page_or_widget) = @_;
3150 3736
3151 my $widget = ref $page_or_widget 3737 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3738 ? $page_or_widget
… …
3184 $self->{current}->draw; 3770 $self->{current}->draw;
3185} 3771}
3186 3772
3187############################################################################# 3773#############################################################################
3188 3774
3189package CFClient::UI::Notebook; 3775package CFPlus::UI::Notebook;
3190 3776
3191our @ISA = CFClient::UI::VBox::; 3777our @ISA = CFPlus::UI::VBox::;
3192 3778
3193sub new { 3779sub new {
3194 my $class = shift; 3780 my $class = shift;
3195 3781
3196 my $self = $class->SUPER::new ( 3782 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3783 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3785 # filter => # will be put between multiplexer and $self
3200 @_, 3786 @_,
3201 ); 3787 );
3202 3788
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3793}
3208 3794
3209sub add { 3795sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3211 3797
3212 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3213 3799
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3801 markup => $title,
3216 tooltip => $tooltip, 3802 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3804 );
3219 3805
3220 $self->{multiplexer}->add ($widget); 3806 $self->{multiplexer}->add ($widget);
3221} 3807}
3222 3808
3809sub get_current_page {
3810 my ($self) = @_;
3811
3812 $self->{multiplexer}->get_current_page
3813}
3814
3223sub set_current_page { 3815sub set_current_page {
3224 my ($self, $page) = @_; 3816 my ($self, $page) = @_;
3225 3817
3226 $self->{multiplexer}->set_current_page ($page); 3818 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3819 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3820}
3229 3821
3230############################################################################# 3822#############################################################################
3231 3823
3232package CFClient::UI::Combobox; 3824package CFPlus::UI::Selector;
3233 3825
3234use utf8; 3826use utf8;
3235 3827
3236our @ISA = CFClient::UI::Button::; 3828our @ISA = CFPlus::UI::Button::;
3237 3829
3238sub new { 3830sub new {
3239 my $class = shift; 3831 my $class = shift;
3240 3832
3241 my $self = $class->SUPER::new ( 3833 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3850 my ($value, $title, $tooltip) = @$_;
3259 3851
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3853 }
3262 3854
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3856}
3265 3857
3266sub _set_value { 3858sub _set_value {
3267 my ($self, $value) = @_; 3859 my ($self, $value) = @_;
3268 3860
… …
3283 $self->emit (changed => $value); 3875 $self->emit (changed => $value);
3284} 3876}
3285 3877
3286############################################################################# 3878#############################################################################
3287 3879
3288package CFClient::UI::Statusbox; 3880package CFPlus::UI::Statusbox;
3289 3881
3290our @ISA = CFClient::UI::VBox::; 3882our @ISA = CFPlus::UI::VBox::;
3291 3883
3292sub new { 3884sub new {
3293 my $class = shift; 3885 my $class = shift;
3294 3886
3295 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3888 fontsize => 0.8,
3297 @_, 3889 @_,
3298 ); 3890 );
3299 3891
3300 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3301 3893
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3895
3304 $self 3896 $self
3305} 3897}
… …
3307sub reorder { 3899sub reorder {
3308 my ($self) = @_; 3900 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3901 my $NOW = Time::HiRes::time;
3310 3902
3311 # freeze display when hovering over any label 3903 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3904 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3906 values %{ $self->{item} };
3315 3907
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3908 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3909 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3910 }
… …
3339 for ($short) { 3931 for ($short) {
3340 s/^\s+//; 3932 s/^\s+//;
3341 s/\s+/ /g; 3933 s/\s+/ /g;
3342 } 3934 }
3343 3935
3344 new CFClient::UI::Label 3936 new CFPlus::UI::Label
3345 markup => $short, 3937 markup => $short,
3346 tooltip => $item->{tooltip}, 3938 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3939 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3940 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3941 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 3995 count => 1,
3404 %arg, 3996 %arg,
3405 }; 3997 };
3406 } 3998 }
3407 3999
4000 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 4001 $self->reorder;
4002 });
3409} 4003}
3410 4004
3411sub reconfigure { 4005sub reconfigure {
3412 my ($self) = @_; 4006 my ($self) = @_;
3413 4007
… …
3426 $self->SUPER::destroy; 4020 $self->SUPER::destroy;
3427} 4021}
3428 4022
3429############################################################################# 4023#############################################################################
3430 4024
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; 4025package CFPlus::UI::Root;
3804 4026
3805our @ISA = CFClient::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
3806 4028
3807use List::Util qw(min max); 4029use List::Util qw(min max);
3808 4030
3809use CFClient::OpenGL; 4031use CFPlus::OpenGL;
3810 4032
3811sub new { 4033sub new {
3812 my $class = shift; 4034 my $class = shift;
3813 4035
3814 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3815 visible => 1, 4037 visible => 1,
3816 @_, 4038 @_,
3817 ); 4039 );
3818 4040
3819 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3820 4042
3821 $self 4043 $self
3822} 4044}
3823 4045
3824sub size_request { 4046sub size_request {
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4213
3992 $w = 0 if $w < 0; 4214 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 4215 $h = 0 if $h < 0;
3994 4216
4217 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h;
4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225
3995 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3997 4228
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
… …
4009 4240
4010 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
4011 $_->() 4242 $_->()
4012 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
4013 } 4244 }
4014
4015 4245
4016 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4019 4249
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4252 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4253 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4254 glLoadIdentity;
4025 4255
4026 { 4256 {
4027 package CFClient::UI::Base; 4257 package CFPlus::UI::Base;
4028 4258
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4259 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4260 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4261
4033 $self->_draw; 4262 $self->_draw;
4263 }
4034} 4264}
4035 4265
4036############################################################################# 4266#############################################################################
4037 4267
4038package CFClient::UI; 4268package CFPlus::UI;
4039 4269
4040$ROOT = new CFClient::UI::Root; 4270$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4271$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4272
40431 42731
4044 4274

Diff Legend

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