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.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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