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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.358 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

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