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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
597 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
598 661
599 eval { $self->destroy }; 662 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
601} 666}
602 667
603############################################################################# 668#############################################################################
604 669
605package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
606 671
607our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
608 673
609use strict; 674use strict;
610use CFClient::OpenGL; 675use CFPlus::OpenGL;
611 676
612sub new { 677sub new {
613 my $class = shift; 678 my $class = shift;
614 679
615 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
646 } 711 }
647} 712}
648 713
649############################################################################# 714#############################################################################
650 715
651package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
652 717
653our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
654 719
655sub new { 720sub new {
656 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
658} 723}
… …
665 730
666sub draw { } 731sub draw { }
667 732
668############################################################################# 733#############################################################################
669 734
670package CFClient::UI::Container; 735package CFPlus::UI::Container;
671 736
672our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
673 738
674sub new { 739sub new {
675 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
676 741
677 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
686 if $children; 751 if $children;
687 752
688 $self 753 $self
689} 754}
690 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
691sub add { 764sub add {
692 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
693 766
694 $_->set_parent ($self) 767 $_->set_parent ($self)
695 for @widgets; 768 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
756} 829}
757 830
758############################################################################# 831#############################################################################
759 832
760package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
761 834
762our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
763 836
764sub new { 837sub new {
765 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
766 839
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 841
769 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
770} 843}
771 844
772sub add { 845sub add {
… …
779sub remove { 852sub remove {
780 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
781 854
782 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
783 856
784 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 858 unless @{$self->{children}};
786} 859}
787 860
788sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
789 862
790sub size_request { 863sub size_request {
791 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
792} 865}
793 866
794sub size_allocate { 867sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
796 869
797 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
798} 873}
799 874
800############################################################################# 875#############################################################################
801 876
802# back-buffered drawing area 877# back-buffered drawing area
803 878
804package CFClient::UI::Window; 879package CFPlus::UI::Window;
805 880
806our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
807 882
808use CFClient::OpenGL; 883use CFPlus::OpenGL;
809 884
810sub new { 885sub new {
811 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
812 887
813 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
818 893
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 895 $self->SUPER::update;
821} 896}
822 897
823sub size_allocate { 898sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
825 900
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
828} 904}
829 905
830sub _render { 906sub _render {
831 my ($self) = @_; 907 my ($self) = @_;
832 908
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
875our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
876 950
877sub new { 951sub new {
878 my $class = shift; 952 my $class = shift;
879 953
880 $class->SUPER::new ( 954 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
894 968
895 ($w, $h) 969 ($w, $h)
896} 970}
897 971
898sub size_allocate { 972sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
900 974
901 my $child = $self->child; 975 my $child = $self->child;
902 976
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 979
906 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
907 $self->update; 981 $self->update;
982
983 1
908} 984}
909 985
910sub set_offset { 986sub set_offset {
911 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
912 988
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
986 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
987 1080
988 $self 1081 $self
989} 1082}
1083
1084#TODO# update range on size_allocate depending on child
990 1085
991sub add { 1086sub add {
992 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
993 1088
994 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
995} 1090}
996 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1112}
1113
997sub update { 1114sub update {
998 my ($self) = @_; 1115 my ($self) = @_;
999 1116
1000 $self->SUPER::update; 1117 $self->SUPER::update;
1001 1118 $self->update_slider;
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1119}
1006 1120
1007sub size_allocate { 1121sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1009 1123
1124 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1125 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1126}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1127
1019############################################################################# 1128#############################################################################
1020 1129
1021package CFClient::UI::Frame; 1130package CFPlus::UI::Frame;
1022 1131
1023our @ISA = CFClient::UI::Bin::; 1132our @ISA = CFPlus::UI::Bin::;
1024 1133
1025use CFClient::OpenGL; 1134use CFPlus::OpenGL;
1026 1135
1027sub new { 1136sub new {
1028 my $class = shift; 1137 my $class = shift;
1029 1138
1030 $class->SUPER::new ( 1139 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1165 $self->SUPER::_draw;
1057} 1166}
1058 1167
1059############################################################################# 1168#############################################################################
1060 1169
1061package CFClient::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1062 1171
1063our @ISA = CFClient::UI::Bin::; 1172our @ISA = CFPlus::UI::Bin::;
1064 1173
1065use CFClient::OpenGL; 1174use CFPlus::OpenGL;
1175
1176sub new {
1177 my ($class, %arg) = @_;
1178
1179 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label
1181 align => 1,
1182 valign => 0,
1183 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75;
1185 }
1186
1187 my $self = $class->SUPER::new (
1188 # label => "",
1189 fg => [0.6, 0.3, 0.1],
1190 border => 0.8,
1191 style => 'single',
1192 %arg,
1193 );
1194
1195 $self
1196}
1197
1198sub add {
1199 my ($self, @widgets) = @_;
1200
1201 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1203}
1204
1205sub border {
1206 int $_[0]{border} * $::FONTSIZE
1207}
1208
1209sub size_request {
1210 my ($self) = @_;
1211
1212 ($self->{label_w}, undef) = $self->{label}->size_request
1213 if $self->{label};
1214
1215 my ($w, $h) = $self->SUPER::size_request;
1216
1217 (
1218 $w + $self->border * 2,
1219 $h + $self->border * 2,
1220 )
1221}
1222
1223sub invoke_size_allocate {
1224 my ($self, $w, $h) = @_;
1225
1226 my $border = $self->border;
1227
1228 $w -= List::Util::max 0, $border * 2;
1229 $h -= List::Util::max 0, $border * 2;
1230
1231 if (my $label = $self->{label}) {
1232 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1233 $label->{h} = List::Util::min $h, $border;
1234 $label->invoke_size_allocate ($label->{w}, $label->{h});
1235 }
1236
1237 $self->child->configure ($border, $border, $w, $h);
1238
1239 1
1240}
1241
1242sub _draw {
1243 my ($self) = @_;
1244
1245 my $child = $self->{children}[0];
1246
1247 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h});
1249
1250 $child->draw;
1251
1252 glColor @{$self->{fg}};
1253 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1258 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1259 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1260 glEnd;
1261
1262 if ($self->{label}) {
1263 glTranslate $border * 2, 0;
1264 $self->{label}->_draw;
1265 }
1266}
1267
1268#############################################################################
1269
1270package CFPlus::UI::Toplevel;
1271
1272our @ISA = CFPlus::UI::Bin::;
1273
1274use CFPlus::OpenGL;
1066 1275
1067my $bg = 1276my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1278 mipmap => 1, wrap => 1;
1070 1279
1071my @border = 1280my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1281 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1283
1075sub new { 1284sub new {
1076 my ($class, %arg) = @_; 1285 my ($class, %arg) = @_;
1077 1286
1078 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1288 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1289 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1290 border => 0.6,
1082 can_events => 1, 1291 can_events => 1,
1083 min_w => 16, 1292 min_w => 64,
1084 min_h => 16, 1293 min_h => 32,
1085 %arg, 1294 %arg,
1086 ); 1295 );
1087 1296
1088 $self->{title_widget} = new CFClient::UI::Label 1297 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1298 align => 0,
1090 valign => 1, 1299 valign => 1,
1091 text => $self->{title}, 1300 text => $self->{title},
1092 fontsize => $self->{border}, 1301 fontsize => $self->{border},
1093 if exists $self->{title}; 1302 if exists $self->{title};
1094 1303
1304 if ($self->{has_close_button}) {
1305 $self->{close_button} =
1306 new CFPlus::UI::ImageButton
1307 path => 'x1_close.png',
1308 on_activate => sub { $self->emit ("delete") };
1309
1310 $self->CFPlus::UI::Container::add ($self->{close_button});
1311 }
1312
1095 $self 1313 $self
1096} 1314}
1097 1315
1098sub add { 1316sub add {
1099 my ($self, @widgets) = @_; 1317 my ($self, @widgets) = @_;
1100 1318
1101 $self->SUPER::add (@widgets); 1319 $self->SUPER::add (@widgets);
1320 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1322}
1104 1323
1105sub border { 1324sub border {
1106 int $_[0]{border} * $::FONTSIZE 1325 int $_[0]{border} * $::FONTSIZE
1107} 1326}
… …
1109sub size_request { 1328sub size_request {
1110 my ($self) = @_; 1329 my ($self) = @_;
1111 1330
1112 $self->{title_widget}->size_request 1331 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1332 if $self->{title_widget};
1333
1334 $self->{close_button}->size_request
1335 if $self->{close_button};
1114 1336
1115 my ($w, $h) = $self->SUPER::size_request; 1337 my ($w, $h) = $self->SUPER::size_request;
1116 1338
1117 ( 1339 (
1118 $w + $self->border * 2, 1340 $w + $self->border * 2,
1119 $h + $self->border * 2, 1341 $h + $self->border * 2,
1120 ) 1342 )
1121} 1343}
1122 1344
1123sub size_allocate { 1345sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1346 my ($self, $w, $h) = @_;
1125 1347
1126 if ($self->{title_widget}) { 1348 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1349 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1350 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1351 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1352 }
1131 1353
1132 my $border = $self->border; 1354 my $border = $self->border;
1133 1355
1134 $h -= List::Util::max 0, $border * 2; 1356 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1357 $w -= List::Util::max 0, $border * 2;
1358
1359 $self->child->configure ($border, $border, $w, $h);
1360
1361 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1362 if $self->{close_button};
1363
1364 1
1365}
1366
1367sub invoke_delete {
1368 my ($self) = @_;
1369
1370 $self->hide;
1136 1371
1137 $self->child->configure ($border, $border, $w, $h); 1372 1
1138} 1373}
1139 1374
1140sub button_down { 1375sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1376 my ($self, $ev, $x, $y) = @_;
1142 1377
1143 my ($w, $h) = @$self{qw(w h)}; 1378 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1379 my $border = $self->border;
1145 1380
… …
1176 1411
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1412 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1413
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1414 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1415 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1416 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1417 };
1183 } else { 1418 } else {
1184 return 0; 1419 return 0;
1185 } 1420 }
1186 1421
1187 1 1422 1
1188} 1423}
1189 1424
1190sub button_up { 1425sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1426 my ($self, $ev, $x, $y) = @_;
1192 1427
1193 !!delete $self->{motion} 1428 ! ! delete $self->{motion}
1194} 1429}
1195 1430
1196sub mouse_motion { 1431sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1432 my ($self, $ev, $x, $y) = @_;
1198 1433
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1434 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1435
1201 !!$self->{motion} 1436 ! ! $self->{motion}
1437}
1438
1439sub invoke_visibility_change {
1440 my ($self, $visible) = @_;
1441
1442 delete $self->{motion} unless $visible;
1443
1444 0
1202} 1445}
1203 1446
1204sub _draw { 1447sub _draw {
1205 my ($self) = @_; 1448 my ($self) = @_;
1206 1449
… …
1235 $child->draw; 1478 $child->draw;
1236 1479
1237 if ($self->{title_widget}) { 1480 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1481 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1482 $self->{title_widget}->_draw;
1483
1484 glTranslate 0, - ($border - $self->{h});
1240 } 1485 }
1486
1487 $self->{close_button}->draw
1488 if $self->{close_button};
1241} 1489}
1242 1490
1243############################################################################# 1491#############################################################################
1244 1492
1245package CFClient::UI::Table; 1493package CFPlus::UI::Table;
1246 1494
1247our @ISA = CFClient::UI::Base::; 1495our @ISA = CFPlus::UI::Base::;
1248 1496
1249use List::Util qw(max sum); 1497use List::Util qw(max sum);
1250 1498
1251use CFClient::OpenGL; 1499use CFPlus::OpenGL;
1252 1500
1253sub new { 1501sub new {
1254 my $class = shift; 1502 my $class = shift;
1255 1503
1256 $class->SUPER::new ( 1504 $class->SUPER::new (
1257 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1258 @_, 1507 @_,
1259 ) 1508 )
1260} 1509}
1261 1510
1262sub children { 1511sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1513}
1265 1514
1266sub add { 1515sub add {
1267 my ($self, $x, $y, $child) = @_; 1516 my ($self) = shift;
1268 1517
1518 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1520 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1521 $self->{children}[$y][$x] = $child;
1522 }
1271 1523
1524 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1526 $self->realloc;
1273} 1527}
1274 1528
1275sub remove { 1529sub remove {
1276 my ($self, $child) = @_; 1530 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1578 (sum @$ws),
1325 (sum @$hs), 1579 (sum @$hs),
1326 ) 1580 )
1327} 1581}
1328 1582
1329sub size_allocate { 1583sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1331 1585
1332 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1333 1587
1334 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1336 1590
1337 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1338 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1341 1595
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1597
1346 CFClient::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1347 CFClient::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1348 1607
1349 my $y; 1608 my $y;
1350 1609
1351 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1611 my $row = $self->{children}[$r]
… …
1366 } 1625 }
1367 1626
1368 $y += $row_h; 1627 $y += $row_h;
1369 } 1628 }
1370 1629
1630 1
1371} 1631}
1372 1632
1373sub find_widget { 1633sub find_widget {
1374 my ($self, $x, $y) = @_; 1634 my ($self, $x, $y) = @_;
1375 1635
… …
1394 } 1654 }
1395} 1655}
1396 1656
1397############################################################################# 1657#############################################################################
1398 1658
1399package CFClient::UI::Box; 1659package CFPlus::UI::Box;
1400 1660
1401our @ISA = CFClient::UI::Container::; 1661our @ISA = CFPlus::UI::Container::;
1402 1662
1403sub size_request { 1663sub size_request {
1404 my ($self) = @_; 1664 my ($self) = @_;
1405 1665
1406 $self->{vertical} 1666 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1672 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1673 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1674 )
1415} 1675}
1416 1676
1417sub size_allocate { 1677sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1678 my ($self, $w, $h) = @_;
1419 1679
1420 my $space = $self->{vertical} ? $h : $w; 1680 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1681 my @children = $self->visible_children;
1422 1682
1423 my @req; 1683 my @req;
1424 1684
1425 if ($self->{homogeneous}) { 1685 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1686 @req = ($space / (@children || 1)) x @children;
1427 } else { 1687 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1688 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1689 my $req = List::Util::sum @req;
1430 1690
1431 if ($req > $space) { 1691 if ($req > $space) {
1432 # ah well, not enough space 1692 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1693 $_ *= $space / $req for @req;
1434 } else { 1694 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1695 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1696
1437 $space = ($space - $req) / $expand; # remaining space to give away 1697 $space = ($space - $req) / $expand; # remaining space to give away
1438 1698
1439 $req[$_] += $space * $children->[$_]{expand} 1699 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1700 for 0 .. $#children;
1441 } 1701 }
1442 } 1702 }
1443 1703
1444 CFClient::UI::harmonize \@req; 1704 CFPlus::UI::harmonize \@req;
1445 1705
1446 my $pos = 0; 1706 my $pos = 0;
1447 for (0 .. $#$children) { 1707 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1708 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1710
1451 $pos += $alloc; 1711 $pos += $alloc;
1452 } 1712 }
1453 1713
1454 1 1714 1
1455} 1715}
1456 1716
1457############################################################################# 1717#############################################################################
1458 1718
1459package CFClient::UI::HBox; 1719package CFPlus::UI::HBox;
1460 1720
1461our @ISA = CFClient::UI::Box::; 1721our @ISA = CFPlus::UI::Box::;
1462 1722
1463sub new { 1723sub new {
1464 my $class = shift; 1724 my $class = shift;
1465 1725
1466 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1469 ) 1729 )
1470} 1730}
1471 1731
1472############################################################################# 1732#############################################################################
1473 1733
1474package CFClient::UI::VBox; 1734package CFPlus::UI::VBox;
1475 1735
1476our @ISA = CFClient::UI::Box::; 1736our @ISA = CFPlus::UI::Box::;
1477 1737
1478sub new { 1738sub new {
1479 my $class = shift; 1739 my $class = shift;
1480 1740
1481 $class->SUPER::new ( 1741 $class->SUPER::new (
… …
1484 ) 1744 )
1485} 1745}
1486 1746
1487############################################################################# 1747#############################################################################
1488 1748
1489package CFClient::UI::Label; 1749package CFPlus::UI::Label;
1490 1750
1491our @ISA = CFClient::UI::DrawBG::; 1751our @ISA = CFPlus::UI::DrawBG::;
1492 1752
1493use CFClient::OpenGL; 1753use CFPlus::OpenGL;
1494 1754
1495sub new { 1755sub new {
1496 my ($class, %arg) = @_; 1756 my ($class, %arg) = @_;
1497 1757
1498 my $self = $class->SUPER::new ( 1758 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1761 #active_bg => none
1502 #font => default_font 1762 #font => default_font
1503 #text => initial text 1763 #text => initial text
1504 #markup => initial narkup 1764 #markup => initial narkup
1505 #max_w => maximum pixel width 1765 #max_w => maximum pixel width
1766 #style => 0, # render flags
1506 ellipsise => 3, # end 1767 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1768 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1769 fontsize => 1,
1509 align => -1, 1770 align => -1,
1510 valign => -1, 1771 valign => -1,
1511 padding_x => 2, 1772 padding_x => 2,
1512 padding_y => 2, 1773 padding_y => 2,
1513 can_events => 0, 1774 can_events => 0,
1514 %arg 1775 %arg
1515 ); 1776 );
1516 1777
1517 if (exists $self->{template}) { 1778 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1779 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1780 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1781 $self->{template} = $layout;
1521 } 1782 }
1522 1783
1523 if (exists $self->{markup}) { 1784 if (exists $self->{markup}) {
… …
1527 } 1788 }
1528 1789
1529 $self 1790 $self
1530} 1791}
1531 1792
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1793sub update {
1543 my ($self) = @_; 1794 my ($self) = @_;
1544 1795
1545 delete $self->{texture}; 1796 delete $self->{texture};
1546 $self->SUPER::update; 1797 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1808 my ($self, $text) = @_;
1558 1809
1559 return if $self->{text} eq "T$text"; 1810 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1811 $self->{text} = "T$text";
1561 1812
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1813 $self->{layout}->set_text ($text);
1564 1814
1565 delete $self->{size_req}; 1815 delete $self->{size_req};
1566 $self->realloc; 1816 $self->realloc;
1567 $self->update; 1817 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1823 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1824 $self->{text} = "M$markup";
1575 1825
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1826 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1827
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1828 $self->{layout}->set_markup ($markup);
1580 1829
1581 delete $self->{size_req}; 1830 delete $self->{size_req};
1582 $self->realloc; 1831 $self->realloc;
1583 $self->update; 1832 $self->update;
… …
1595 1844
1596 my ($w, $h) = $self->{layout}->size; 1845 my ($w, $h) = $self->{layout}->size;
1597 1846
1598 if (exists $self->{template}) { 1847 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1848 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1851
1602 my ($w2, $h2) = $self->{template}->size; 1852 my ($w2, $h2) = $self->{template}->size;
1603 1853
1604 $w = List::Util::max $w, $w2; 1854 $w = List::Util::max $w, $w2;
… …
1609 }; 1859 };
1610 1860
1611 @{ $self->{size_req} } 1861 @{ $self->{size_req} }
1612} 1862}
1613 1863
1864sub baseline_shift {
1865 $_[0]{layout}->descent
1866}
1867
1614sub size_allocate { 1868sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1869 my ($self, $w, $h) = @_;
1616 1870
1617 delete $self->{ox}; 1871 delete $self->{ox};
1618 1872
1619 delete $self->{texture} 1873 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1874 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1875
1876 1
1621} 1877}
1622 1878
1623sub set_fontsize { 1879sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1880 my ($self, $fontsize) = @_;
1625 1881
1626 $self->{fontsize} = $fontsize; 1882 $self->{fontsize} = $fontsize;
1883 delete $self->{size_req};
1627 delete $self->{texture}; 1884 delete $self->{texture};
1628 1885
1629 $self->realloc; 1886 $self->realloc;
1630} 1887}
1631 1888
1632sub reconfigure { 1889sub reconfigure {
1633 my ($self) = @_; 1890 my ($self) = @_;
1634 1891
1635 delete $self->{size_req}; 1892 delete $self->{size_req};
1893 delete $self->{texture};
1636 1894
1637 $self->SUPER::reconfigure; 1895 $self->SUPER::reconfigure;
1638} 1896}
1639 1897
1640sub _draw { 1898sub _draw {
1641 my ($self) = @_; 1899 my ($self) = @_;
1642 1900
1643 $self->SUPER::_draw; # draw background, if applicable 1901 $self->SUPER::_draw; # draw background, if applicable
1644 1902
1645 my $tex = $self->{texture} ||= do { 1903 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1904 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1905 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1906 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1907 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1908 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1910
1653 new_from_layout CFClient::Texture $self->{layout} 1911 [$self->{layout}->size]
1654 }; 1912 };
1655 1913
1656 unless (exists $self->{ox}) { 1914 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1917 : ($self->{w} - $size->[0]) * 0.5);
1660 1918
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1921 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1922 };
1665 1923
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1926
1671 if ($tex->{format} == GL_ALPHA) { 1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1928}
1682 1929
1683############################################################################# 1930#############################################################################
1684 1931
1685package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1686 1933
1687our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1688 1935
1689use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1690 1937
1691sub new { 1938sub new {
1692 my $class = shift; 1939 my $class = shift;
1693 1940
1694 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1699 can_hover => 1, 1946 can_hover => 1,
1700 can_focus => 1, 1947 can_focus => 1,
1701 valign => 0, 1948 valign => 0,
1702 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1703 #text => ... 1951 #text => ...
1704 #hidden => "*", 1952 #hidden => "*",
1705 @_ 1953 @_
1706 ) 1954 )
1707} 1955}
… …
1718 1966
1719 $text =~ s/./*/g if $self->{hidden}; 1967 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1968 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1969 delete $self->{size_req};
1722 1970
1723 $self->_emit (changed => $self->{text}); 1971 $self->emit (changed => $self->{text});
1724 1972
1725 $self->realloc; 1973 $self->realloc;
1726 $self->update; 1974 $self->update;
1727} 1975}
1728 1976
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1991 my ($w, $h) = $self->SUPER::size_request;
1744 1992
1745 ($w + 1, $h) # add 1 for cursor 1993 ($w + 1, $h) # add 1 for cursor
1746} 1994}
1747 1995
1748sub key_down { 1996sub invoke_key_down {
1749 my ($self, $ev) = @_; 1997 my ($self, $ev) = @_;
1750 1998
1751 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1754 2002
1755 my $text = $self->get_text; 2003 my $text = $self->get_text;
2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2006
1757 if ($uni == 8) { 2007 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
2027 } elsif ($uni == 21) { # ctrl-u
2028 $text = "";
1766 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2031 $self->emit ('escape');
1771 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2036 } else {
1774 return 0; 2037 return 0;
1775 } 2038 }
1776 2039
1777 $self->_set_text ($text); 2040 $self->_set_text ($text);
1778 2041
1779 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1780 2044
1781 1 2045 1
1782} 2046}
1783 2047
1784sub focus_in { 2048sub invoke_focus_in {
1785 my ($self) = @_; 2049 my ($self) = @_;
1786 2050
1787 $self->{last_activity} = $::NOW; 2051 $self->{last_activity} = $::NOW;
1788 2052
1789 $self->SUPER::focus_in; 2053 $self->SUPER::invoke_focus_in
1790} 2054}
1791 2055
1792sub button_down { 2056sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1794 2058
1795 $self->SUPER::button_down ($ev, $x, $y); 2059 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2060
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2062
1799 # byte-index to char-index 2063 # byte-index to char-index
1800 my $text = $self->{text}; 2064 my $text = $self->{text};
1801 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1803 2067
1804 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1805 $self->update; 2069 $self->update;
1806 2070
1807 1 2071 1
1808} 2072}
1809 2073
1810sub mouse_motion { 2074sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2075 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2076# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2077
1814 0 2078 1
1815} 2079}
1816 2080
1817sub _draw { 2081sub _draw {
1818 my ($self) = @_; 2082 my ($self) = @_;
1819 2083
… …
1846 utf8::encode $text; 2110 utf8::encode $text;
1847 2111
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2113 }
1850 2114
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2115 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2116 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2118 glEnd;
1856 } 2119 }
1857} 2120}
1858 2121
2122#############################################################################
2123
1859package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1860 2125
1861our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1862 2127
1863use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1864 2129
1865sub key_down { 2130sub invoke_key_down {
1866 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1867 2132
1868 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1869 2134
1870 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
2138
1873 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2141 $self->emit (activate => $txt);
1876 $self->update; 2142 $self->update;
1877 2143
1878 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1881 } 2147 }
1882 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2152 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2154 }
1889 2155
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2159
1894 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2162 } else {
1897 $self->set_text ($self->{history_saveback}); 2163 $self->set_text ($self->{history_saveback});
1898 } 2164 }
1899 2165
1900 } else { 2166 } else {
1901 return $self->SUPER::key_down ($ev) 2167 return $self->SUPER::invoke_key_down ($ev)
1902 } 2168 }
1903 2169
1904 1 2170 1
1905} 2171}
1906 2172
1907############################################################################# 2173#############################################################################
1908 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
1909package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1910 2215
1911our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1912 2217
1913use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1914 2219
1915my @tex = 2220my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1918 2223
1919sub new { 2224sub new {
1920 my $class = shift; 2225 my $class = shift;
1921 2226
… …
1930 can_events => 1, 2235 can_events => 1,
1931 @_ 2236 @_
1932 ) 2237 )
1933} 2238}
1934 2239
1935sub activate { }
1936
1937sub button_up { 2240sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1939 2242
1940 $self->emit ("activate") 2243 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2244 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2245 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1961} 2264}
1962 2265
1963############################################################################# 2266#############################################################################
1964 2267
1965package CFClient::UI::CheckBox; 2268package CFPlus::UI::CheckBox;
1966 2269
1967our @ISA = CFClient::UI::DrawBG::; 2270our @ISA = CFPlus::UI::DrawBG::;
1968 2271
1969my @tex = 2272my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2275
1973use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1974 2277
1975sub new { 2278sub new {
1976 my $class = shift; 2279 my $class = shift;
1977 2280
1978 $class->SUPER::new ( 2281 $class->SUPER::new (
… …
1992 my ($self) = @_; 2295 my ($self) = @_;
1993 2296
1994 (6) x 2 2297 (6) x 2
1995} 2298}
1996 2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
1997sub button_down { 2308sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2309 my ($self, $ev, $x, $y) = @_;
1999 2310
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2313 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2314 } else {
2005 return 0 2315 return 0
2006 } 2316 }
2007 2317
2008 1 2318 1
… …
2028 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2029} 2339}
2030 2340
2031############################################################################# 2341#############################################################################
2032 2342
2033package CFClient::UI::Image; 2343package CFPlus::UI::Image;
2034 2344
2035our @ISA = CFClient::UI::Base::; 2345our @ISA = CFPlus::UI::Base::;
2036 2346
2037use CFClient::OpenGL; 2347use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2348
2040our %loaded_images; 2349our %texture_cache;
2041 2350
2042sub new { 2351sub new {
2043 my $class = shift; 2352 my $class = shift;
2044 2353
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
2046 2358
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2359 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required";
2048 2361
2049 $loaded_images{$self->{image}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2364
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
2053 2366
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2368
2058 $self 2369 $self
2059} 2370}
2060 2371
2372sub STORABLE_freeze {
2373 my ($self, $cloning) = @_;
2374
2375 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2377
2378 $self->{path}
2379}
2380
2381sub STORABLE_attach {
2382 my ($self, $cloning, $path) = @_;
2383
2384 $self->new (path => $path)
2385}
2386
2061sub size_request { 2387sub size_request {
2062 my ($self) = @_; 2388 my ($self) = @_;
2063 2389
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2390 ($self->{tex}{w}, $self->{tex}{h})
2065} 2391}
2066 2392
2067sub _draw { 2393sub _draw {
2068 my ($self) = @_; 2394 my ($self) = @_;
2069 2395
… …
2079 } 2405 }
2080 2406
2081 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2409
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2410 $tex->draw_quad (0, 0, $w, $h);
2085 2411
2086 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
2087} 2413}
2088 2414
2089############################################################################# 2415#############################################################################
2090 2416
2417package CFPlus::UI::ImageButton;
2418
2419our @ISA = CFPlus::UI::Image::;
2420
2421use CFPlus::OpenGL;
2422
2423my %textures;
2424
2425sub new {
2426 my $class = shift;
2427
2428 my $self = $class->SUPER::new (
2429 padding_x => 4,
2430 padding_y => 4,
2431 fg => [1, 1, 1],
2432 active_fg => [0, 0, 1],
2433 can_hover => 1,
2434 align => 0,
2435 valign => 0,
2436 can_events => 1,
2437 @_
2438 );
2439}
2440
2441sub invoke_button_up {
2442 my ($self, $ev, $x, $y) = @_;
2443
2444 $self->emit ("activate")
2445 if $x >= 0 && $x < $self->{w}
2446 && $y >= 0 && $y < $self->{h};
2447
2448 1
2449}
2450
2451#############################################################################
2452
2091package CFClient::UI::VGauge; 2453package CFPlus::UI::VGauge;
2092 2454
2093our @ISA = CFClient::UI::Base::; 2455our @ISA = CFPlus::UI::Base::;
2094 2456
2095use List::Util qw(min max); 2457use List::Util qw(min max);
2096 2458
2097use CFClient::OpenGL; 2459use CFPlus::OpenGL;
2098 2460
2099my %tex = ( 2461my %tex = (
2100 food => [ 2462 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2465 ],
2104 grace => [ 2466 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2469 ],
2108 hp => [ 2470 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2473 ],
2112 mana => [ 2474 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2477 ],
2116); 2478);
2117 2479
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2542
2181 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2544 my $h2 = $self->{h} * (1 - $ycut2);
2545 my $h3 = $self->{h};
2546
2547 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2548
2184 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
… …
2206 2571
2207 if ($t3) { 2572 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2579 glEnd;
2215 } 2580 }
2216 2581
2217 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2219} 2584}
2220 2585
2221############################################################################# 2586#############################################################################
2222 2587
2223package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2224 2589
2225our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2226 2591
2227sub new { 2592sub new {
2228 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2229 2594
2230 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2597 can_hover => 1,
2233 can_events => 1, 2598 can_events => 1,
2234 %arg, 2599 %arg,
2235 ); 2600 );
2236 2601
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2602 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2603 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2605
2241 $self 2606 $self
2242} 2607}
2243 2608
2244sub set_fontsize { 2609sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2266} 2631}
2267 2632
2268############################################################################# 2633#############################################################################
2269 2634
2270package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2271 2636
2272use strict; 2637use strict;
2273 2638
2274use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2275 2640
2276our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2277 2642
2278my @tex = 2643my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2281 2646
2282sub new { 2647sub new {
2283 my $class = shift; 2648 my $class = shift;
2284 2649
… …
2305 $self->update; 2670 $self->update;
2306 2671
2307 $self 2672 $self
2308} 2673}
2309 2674
2310sub changed { }
2311
2312sub set_range { 2675sub set_range {
2313 my ($self, $range) = @_; 2676 my ($self, $range) = @_;
2314 2677
2315 ($range, $self->{range}) = ($self->{range}, $range); 2678 ($range, $self->{range}) = ($self->{range}, $range);
2316 2679
… …
2336 if $unit; 2699 if $unit;
2337 2700
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2701 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2702
2340 if ($value != $old_value) { 2703 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2704 $self->emit (changed => $value);
2342 $self->update; 2705 $self->update;
2343 } 2706 }
2344} 2707}
2345 2708
2346sub size_request { 2709sub size_request {
2347 my ($self) = @_; 2710 my ($self) = @_;
2348 2711
2349 ($self->{req_w}, $self->{req_h}) 2712 ($self->{req_w}, $self->{req_h})
2350} 2713}
2351 2714
2352sub button_down { 2715sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2716 my ($self, $ev, $x, $y) = @_;
2354 2717
2355 $self->SUPER::button_down ($ev, $x, $y); 2718 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2719
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2721
2359 $self->mouse_motion ($ev, $x, $y) 2722 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2723}
2361 2724
2362sub mouse_motion { 2725sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2726 my ($self, $ev, $x, $y) = @_;
2364 2727
2365 if ($GRAB == $self) { 2728 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2729 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2730
… …
2373 } else { 2736 } else {
2374 return 0; 2737 return 0;
2375 } 2738 }
2376 2739
2377 1 2740 1
2741}
2742
2743sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_;
2745
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751
2752 ! ! $delta
2378} 2753}
2379 2754
2380sub update { 2755sub update {
2381 my ($self) = @_; 2756 my ($self) = @_;
2382 2757
… …
2431 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2432} 2807}
2433 2808
2434############################################################################# 2809#############################################################################
2435 2810
2436package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2437 2812
2438our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2439 2814
2440sub new { 2815sub new {
2441 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2442 2817
2443 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2444 2819
2445 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2823 to_value => sub { shift },
2449 from_value => sub { shift }, 2824 from_value => sub { shift },
2450 %arg, 2825 %arg,
2451 ); 2826 );
2452 2827
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2474 2849
2475############################################################################# 2850#############################################################################
2476 2851
2477package CFClient::UI::TextScroller; 2852package CFPlus::UI::TextScroller;
2478 2853
2479our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2480 2855
2481use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2482 2857
2483sub new { 2858sub new {
2484 my $class = shift; 2859 my $class = shift;
2485 2860
2486 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2487 fontsize => 1, 2862 fontsize => 1,
2488 can_events => 0, 2863 can_events => 1,
2489 indent => 0, 2864 indent => 0,
2490 #font => default_font 2865 #font => default_font
2491 @_, 2866 @_,
2492 2867
2493 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2494 par => [], 2869 par => [],
2870 max_par => 0,
2495 height => 0, 2871 height => 0,
2496 children => [ 2872 children => [
2497 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2875 ],
2500 ); 2876 );
2501 2877
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2879
… …
2509 2885
2510 $self->{fontsize} = $fontsize; 2886 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2887 $self->reflow;
2512} 2888}
2513 2889
2890sub size_request {
2891 my ($self) = @_;
2892
2893 my ($empty, $slider) = @{ $self->{children} };
2894
2895 local $self->{children} = [$empty, $slider];
2896 $self->SUPER::size_request
2897}
2898
2514sub size_allocate { 2899sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2900 my ($self, $w, $h) = @_;
2516 2901
2517 $self->SUPER::size_allocate ($w, $h); 2902 my ($empty, $slider, @other) = @{ $self->{children} };
2903 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2904
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2905 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2906 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2907 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2908 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2909
2524 $self->reflow; 2910 $self->reflow;
2525}
2526 2911
2527sub text_size { 2912 local $self->{children} = [$empty, $slider];
2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 2917 my ($self, $ev) = @_;
2918
2919 return 0 unless $ev->{dy}; # only vertical movements
2920
2921 $self->{children}[1]->emit (mouse_wheel => $ev);
2922
2923 1
2924}
2925
2926sub get_layout {
2927 my ($self, $para) = @_;
2529 2928
2530 my $layout = $self->{layout}; 2929 my $layout = $self->{layout};
2531 2930
2931 $layout->set_font ($self->{font}) if $self->{font};
2932 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2933 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2934 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2935 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2936 $layout->set_markup ($para->{markup});
2937
2938 $layout->set_shapes (
2939 map
2940 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2941 @{$para->{widget}}
2536 2942 );
2943
2537 $layout->size 2944 $layout
2538} 2945}
2539 2946
2540sub reflow { 2947sub reflow {
2541 my ($self) = @_; 2948 my ($self) = @_;
2542 2949
… …
2549 2956
2550 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2552} 2959}
2553 2960
2961sub current_paragraph {
2962 my ($self) = @_;
2963
2964 $self->{top_paragraph} - 1
2965}
2966
2967sub scroll_to {
2968 my ($self, $para) = @_;
2969
2970 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2971
2972 $self->{scroll_to} = $para;
2973 $self->update;
2974}
2975
2554sub clear { 2976sub clear {
2555 my ($self) = @_; 2977 my ($self) = @_;
2978
2979 my (undef, undef, @other) = @{ $self->{children} };
2980 $self->remove ($_) for @other;
2556 2981
2557 $self->{par} = []; 2982 $self->{par} = [];
2558 $self->{height} = 0; 2983 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2985}
2561 2986
2562sub add_paragraph { 2987sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2988 my $self = shift;
2564 2989
2565 for my $line (split /\n/, $text) { 2990 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 2991 $para = {
2992 fg => [1, 1, 1, 1],
2993 indent => 0,
2994 markup => "",
2995 widget => [],
2996 ref $para ? %$para : (markup => $para),
2997 w => 1e10,
2998 wrapped => 1,
2999 };
3000
3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3002 push @{$self->{par}}, $para;
3003 }
3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
3008
3009 $self->{need_reflow}++;
3010 $self->update;
3011}
3012
3013sub scroll_to_bottom {
3014 my ($self) = @_;
3015
3016 $self->{scroll_to} = $#{$self->{par}};
3017 $self->update;
3018}
3019
3020sub force_uptodate {
3021 my ($self) = @_;
3022
3023 if (delete $self->{need_reflow}) {
3024 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3025
3026 my $height = 0;
3027
3028 for my $para (@{$self->{par}}) {
3029 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3030 my $layout = $self->get_layout ($para);
3031 my ($w, $h) = $layout->size;
3032
3033 $para->{w} = $w + $para->{indent};
3034 $para->{h} = $h;
3035 $para->{wrapped} = $layout->has_wrapped;
3036 }
3037
3038 $para->{y} = $height;
3039 $height += $para->{h};
3040 }
3041
2567 $self->{height} += $h; 3042 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3044
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3045 delete $self->{texture};
3046 }
3047
3048 if (my $paridx = delete $self->{scroll_to}) {
3049 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3050 }
2572} 3051}
2573 3052
2574sub update { 3053sub update {
2575 my ($self) = @_; 3054 my ($self) = @_;
2576 3055
… …
2579 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2580 3059
2581 delete $self->{texture}; 3060 delete $self->{texture};
2582 3061
2583 $ROOT->on_post_alloc ($self => sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3066
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2616 3070
3071 package CFPlus::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h});
3074
3075 my $top = int $self->{children}[1]{range}[0];
3076
3077 my $paridx = 0;
3078 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2618 3080
2619 my $y0 = $top; 3081 my $y0 = $top;
2620 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2621 3083
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3084 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2634 3087
2635 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3089 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3090
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3091 $layout->render ($para->{indent}, $y - $y0);
2642 3092
2643 glRasterPos $par->[3], $y - $y0; 3093 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3094 my @s = $layout->get_shapes;
3095
3096 for (@w) {
3097 my ($dx, $dy) = splice @s, 0, 2, ();
3098
3099 $_->{x} = $dx + $para->{indent};
3100 $_->{y} = $dy + $y - $y0;
3101
3102 $_->draw;
3103 }
3104 }
2645 } 3105 }
2646 3106
2647 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3109 }
2649 3110
2650 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2651 }; 3112 };
2652 }); 3113 });
3114}
3115
3116sub reconfigure {
3117 my ($self) = @_;
3118
3119 $self->SUPER::reconfigure;
3120
3121 $_->{w} = 1e10 for @{ $self->{par} };
3122 $self->reflow;
2653} 3123}
2654 3124
2655sub _draw { 3125sub _draw {
2656 my ($self) = @_; 3126 my ($self) = @_;
2657 3127
… …
2660 glColor 0, 0, 0, 1; 3130 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3131 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3132 glDisable GL_TEXTURE_2D;
2663 3133
2664 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2665
2666} 3135}
2667 3136
2668############################################################################# 3137#############################################################################
2669 3138
2670package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2671 3140
2672use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2673 3142
2674our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2675 3144
2676sub moveto { 3145sub moveto {
2677 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2678 3147
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3176 glPopMatrix;
2708} 3177}
2709 3178
2710############################################################################# 3179#############################################################################
2711 3180
2712package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2713 3182
2714our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2715 3184
2716sub new { 3185sub new {
2717 my $class = shift; 3186 my $class = shift;
2718 3187
2719 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2732} 3201}
2733 3202
2734############################################################################# 3203#############################################################################
2735 3204
2736package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2737 3206
2738our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2739 3208
2740use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2741 3210
2742sub new { 3211sub new {
2743 my $class = shift; 3212 my $class = shift;
2744 3213
2745 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2748 ) 3217 )
2749} 3218}
2750 3219
2751sub set_tooltip_from { 3220sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3225
2754 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2755 3227
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3233 }
2762 3234
2763 $tooltip =~ s/^\n+//; 3235 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3236 $tooltip =~ s/\n+$//;
2765 3237
2766 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3239 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3241 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3243 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3245 );
2774} 3246}
2775 3247
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3251 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3252
2781 ($w + 4, $h + 4) 3253 ($w + 4, $h + 4)
2782} 3254}
2783 3255
2784sub size_allocate { 3256sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3257 my ($self, $w, $h) = @_;
2786 3258
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3259 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3260}
2789 3261
2790sub visibility_change { 3262sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3263 my ($self, $visible) = @_;
2792 3264
2793 return unless $visible; 3265 return unless $visible;
2794 3266
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2797 or return; 3269 or return;
2798 3270
3271 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3273
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3275 if $x + $self->{w} > $self->{root}{w};
2803 3276
2804 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2805 }); 3281 });
2806} 3282}
2807 3283
2808sub _draw { 3284sub _draw {
2809 my ($self) = @_; 3285 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2834} 3310}
2835 3311
2836############################################################################# 3312#############################################################################
2837 3313
2838package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2839 3315
2840our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2841 3317
2842use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2843 3319
2844sub new { 3320sub new {
2845 my $class = shift; 3321 my $class = shift;
2846 3322
2847 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2849 can_events => 0, 3325 can_events => 0,
2850 @_, 3326 @_,
2851 ); 3327 );
2852 3328
2853 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2855 3331
2856 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3334 hard => 1,
2859 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
2882sub _draw { 3358sub _draw {
2883 my ($self) = @_; 3359 my ($self) = @_;
2884 3360
2885 return unless $::CONN; 3361 return unless $::CONN;
2886 3362
3363 $self->SUPER::_draw;
3364
2887 my $face; 3365 my $face;
2888 3366
2889 if ($self->{frame}) { 3367 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3369
… …
2913 $self->SUPER::destroy; 3391 $self->SUPER::destroy;
2914} 3392}
2915 3393
2916############################################################################# 3394#############################################################################
2917 3395
2918package CFClient::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
2919 3397
2920our @ISA = CFClient::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
2921 3399
2922# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
2923 3401
2924############################################################################# 3402#############################################################################
2925 3403
2926package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
2927 3405
2928our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
2929 3407
2930use CFClient::OpenGL; 3408use CFPlus::OpenGL;
2931 3409
2932sub new { 3410sub new {
2933 my $class = shift; 3411 my $class = shift;
2934 3412
2935 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
2936 items => [], 3414 items => [],
2937 z => 100, 3415 z => 100,
2938 @_, 3416 @_,
2939 ); 3417 );
2940 3418
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3420
2943 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
2945 3423
2946 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
2947 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
2948 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3430 can_hover => 1,
2950 can_events => 1, 3431 can_events => 1,
3432 tooltip => $tooltip,
3433 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1),
3436 ],
3437 ;
3438
3439 } else {
3440 $widget = new CFPlus::UI::Label
3441 can_hover => 1,
3442 can_events => 1,
2951 markup => $widget, 3443 markup => $widget,
2952 tooltip => $tooltip 3444 tooltip => $tooltip;
3445 }
2953 } 3446 }
2954 3447
2955 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
2956 3449
2957 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
2962 3455
2963# popup given the event (must be a mouse button down event currently) 3456# popup given the event (must be a mouse button down event currently)
2964sub popup { 3457sub popup {
2965 my ($self, $ev) = @_; 3458 my ($self, $ev) = @_;
2966 3459
2967 $self->_emit ("popdown"); 3460 $self->emit ("popdown");
2968 3461
2969 # maybe save $GRAB? must be careful about events... 3462 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3463 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3464 $self->{button} = $ev->{button};
2972 3465
2973 $self->show; 3466 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3467 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3468}
2976 3469
2977sub mouse_motion { 3470sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3471 my ($self, $ev, $x, $y) = @_;
2979 3472
2980 # TODO: should use vbox->find_widget or so 3473 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3474 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3475 $self->{hover} = $self->{item}{$HOVER};
2983 3476
2984 0 3477 0
2985} 3478}
2986 3479
2987sub button_up { 3480sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2989 3482
2990 if ($ev->{button} == $self->{button}) { 3483 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3484 undef $GRAB;
2992 $self->hide; 3485 $self->hide;
2993 3486
2994 $self->_emit ("popdown"); 3487 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3488 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3489 } else {
2997 return 0 3490 return 0
2998 } 3491 }
2999 3492
3000 1 3493 1
3001} 3494}
3002 3495
3003############################################################################# 3496#############################################################################
3004 3497
3005package CFClient::UI::Multiplexer; 3498package CFPlus::UI::Multiplexer;
3006 3499
3007our @ISA = CFClient::UI::Container::; 3500our @ISA = CFPlus::UI::Container::;
3008 3501
3009sub new { 3502sub new {
3010 my $class = shift; 3503 my $class = shift;
3011 3504
3012 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
… …
3026 3519
3027 $self->{current} = $self->{children}[0] 3520 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3521 if @{ $self->{children} };
3029} 3522}
3030 3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
3031sub set_current_page { 3530sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3531 my ($self, $page_or_widget) = @_;
3033 3532
3034 my $widget = ref $page_or_widget 3533 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3534 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3535 : $self->{children}[$page_or_widget];
3037 3536
3038 $self->{current} = $widget; 3537 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3538 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3539
3041 $self->_emit (page_changed => $self->{current}); 3540 $self->emit (page_changed => $self->{current});
3042 3541
3043 $self->realloc; 3542 $self->realloc;
3044} 3543}
3045 3544
3046sub visible_children { 3545sub visible_children {
… …
3051 my ($self) = @_; 3550 my ($self) = @_;
3052 3551
3053 $self->{current}->size_request 3552 $self->{current}->size_request
3054} 3553}
3055 3554
3056sub size_allocate { 3555sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3556 my ($self, $w, $h) = @_;
3058 3557
3059 $self->{current}->configure (0, 0, $w, $h); 3558 $self->{current}->configure (0, 0, $w, $h);
3559
3560 1
3060} 3561}
3061 3562
3062sub _draw { 3563sub _draw {
3063 my ($self) = @_; 3564 my ($self) = @_;
3064 3565
3065 $self->{current}->draw; 3566 $self->{current}->draw;
3066} 3567}
3067 3568
3068############################################################################# 3569#############################################################################
3069 3570
3070package CFClient::UI::Notebook; 3571package CFPlus::UI::Notebook;
3071 3572
3072our @ISA = CFClient::UI::VBox::; 3573our @ISA = CFPlus::UI::VBox::;
3073 3574
3074sub new { 3575sub new {
3075 my $class = shift; 3576 my $class = shift;
3076 3577
3077 my $self = $class->SUPER::new ( 3578 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3579 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3581 # filter => # will be put between multiplexer and $self
3081 @_, 3582 @_,
3082 ); 3583 );
3083 3584
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3589}
3089 3590
3090sub add { 3591sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3092 3593
3093 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3094 3595
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3597 markup => $title,
3097 tooltip => $tooltip, 3598 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3600 );
3100 3601
3101 $self->{multiplexer}->add ($widget); 3602 $self->{multiplexer}->add ($widget);
3102} 3603}
3103 3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3104sub set_current_page { 3611sub set_current_page {
3105 my ($self, $page) = @_; 3612 my ($self, $page) = @_;
3106 3613
3107 $self->{multiplexer}->set_current_page ($page); 3614 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3615 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3616}
3110 3617
3111############################################################################# 3618#############################################################################
3112 3619
3113package CFClient::UI::Combobox; 3620package CFPlus::UI::Selector;
3114 3621
3115use utf8; 3622use utf8;
3116 3623
3117our @ISA = CFClient::UI::Button::; 3624our @ISA = CFPlus::UI::Button::;
3118 3625
3119sub new { 3626sub new {
3120 my $class = shift; 3627 my $class = shift;
3121 3628
3122 my $self = $class->SUPER::new ( 3629 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3635 $self->_set_value ($self->{value});
3129 3636
3130 $self 3637 $self
3131} 3638}
3132 3639
3133sub button_down { 3640sub invoke_button_down {
3134 my ($self, $ev) = @_; 3641 my ($self, $ev) = @_;
3135 3642
3136 my @menu_items; 3643 my @menu_items;
3137 3644
3138 for (@{ $self->{options} }) { 3645 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3646 my ($value, $title, $tooltip) = @$_;
3140 3647
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3649 }
3143 3650
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3652}
3146 3653
3147sub _set_value { 3654sub _set_value {
3148 my ($self, $value) = @_; 3655 my ($self, $value) = @_;
3149 3656
… …
3159 my ($self, $value) = @_; 3666 my ($self, $value) = @_;
3160 3667
3161 return unless $self->{value} ne $value; 3668 return unless $self->{value} ne $value;
3162 3669
3163 $self->_set_value ($value); 3670 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3671 $self->emit (changed => $value);
3165} 3672}
3166 3673
3167############################################################################# 3674#############################################################################
3168 3675
3169package CFClient::UI::Statusbox; 3676package CFPlus::UI::Statusbox;
3170 3677
3171our @ISA = CFClient::UI::VBox::; 3678our @ISA = CFPlus::UI::VBox::;
3172 3679
3173sub new { 3680sub new {
3174 my $class = shift; 3681 my $class = shift;
3175 3682
3176 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3684 fontsize => 0.8,
3178 @_, 3685 @_,
3179 ); 3686 );
3180 3687
3181 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3182 3689
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3691
3185 $self 3692 $self
3186} 3693}
… …
3188sub reorder { 3695sub reorder {
3189 my ($self) = @_; 3696 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3697 my $NOW = Time::HiRes::time;
3191 3698
3192 # freeze display when hovering over any label 3699 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3700 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3702 values %{ $self->{item} };
3196 3703
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3706 }
… …
3220 for ($short) { 3727 for ($short) {
3221 s/^\s+//; 3728 s/^\s+//;
3222 s/\s+/ /g; 3729 s/\s+/ /g;
3223 } 3730 }
3224 3731
3225 new CFClient::UI::Label 3732 new CFPlus::UI::Label
3226 markup => $short, 3733 markup => $short,
3227 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3791 count => 1,
3285 %arg, 3792 %arg,
3286 }; 3793 };
3287 } 3794 }
3288 3795
3796 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3797 $self->reorder;
3798 });
3290} 3799}
3291 3800
3292sub reconfigure { 3801sub reconfigure {
3293 my ($self) = @_; 3802 my ($self) = @_;
3294 3803
… …
3307 $self->SUPER::destroy; 3816 $self->SUPER::destroy;
3308} 3817}
3309 3818
3310############################################################################# 3819#############################################################################
3311 3820
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 3821package CFPlus::UI::Root;
3674 3822
3675our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3676 3824
3677use List::Util qw(min max); 3825use List::Util qw(min max);
3678 3826
3679use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3680 3828
3681sub new { 3829sub new {
3682 my $class = shift; 3830 my $class = shift;
3683 3831
3684 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3685 visible => 1, 3833 visible => 1,
3686 @_, 3834 @_,
3687 ); 3835 );
3688 3836
3689 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3690 3838
3691 $self 3839 $self
3692} 3840}
3693 3841
3694sub size_request { 3842sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 3857 $coord = $max - $size if $coord > $max - $size;
3710 3858
3711 int $coord + 0.5 3859 int $coord + 0.5
3712} 3860}
3713 3861
3714sub size_allocate { 3862sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3863 my ($self, $w, $h) = @_;
3716 3864
3717 for my $child ($self->children) { 3865 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3866 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3867
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3871 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3872 $Y = _to_pixel $Y, $H, $self->{h};
3725 3873
3726 $child->configure ($X, $Y, $W, $H); 3874 $child->configure ($X, $Y, $W, $H);
3727 } 3875 }
3876
3877 1
3728} 3878}
3729 3879
3730sub coord2local { 3880sub coord2local {
3731 my ($self, $x, $y) = @_; 3881 my ($self, $x, $y) = @_;
3732 3882
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4009
3860 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
3862 4012
4013 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h;
4015
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021
3863 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3865 4024
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4026 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4051 glLoadIdentity;
3893 4052
3894 { 4053 {
3895 package CFClient::UI::Base; 4054 package CFPlus::UI::Base;
3896 4055
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4058
3901 $self->_draw; 4059 $self->_draw;
4060 }
3902} 4061}
3903 4062
3904############################################################################# 4063#############################################################################
3905 4064
3906package CFClient::UI; 4065package CFPlus::UI;
3907 4066
3908$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4069
39111 40701
3912 4071

Diff Legend

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