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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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