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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 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->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
393 427
394 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
395 429
396 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
397 431
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 435 }
402} 436}
403 437
404# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
405sub coord2local { 439sub coord2local {
406 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
407 441
442 Carp::confess unless $self->{parent};#d#
443
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 445}
410 446
411# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
412sub coord2global { 448sub coord2global {
413 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
414 450
451 Carp::confess unless $self->{parent};#d#
452
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 454}
417 455
418sub invoke_focus_in { 456sub invoke_focus_in {
419 my ($self) = @_; 457 my ($self) = @_;
420 458
421 return if $FOCUS == $self; 459 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
423 461
424 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
425 463
426 $focus->update if $focus; 464 $self->update;
427 $FOCUS->update;
428 465
429 0 466 0
430} 467}
431 468
432sub invoke_focus_out { 469sub invoke_focus_out {
433 my ($self) = @_; 470 my ($self) = @_;
434 471
435 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
436 473
437 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
438 475
439 $focus->update if $focus; #? 476 $self->update;
440 477
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 479 unless $FOCUS;
443 480
444 0 481 0
445} 482}
446 483
447sub grab_focus { 484sub grab_focus {
448 my ($self) = @_; 485 my ($self) = @_;
449 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
451} 489}
452 490
453sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
457 496
458sub invoke_button_down { 497sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
460 499
461 $self->grab_focus; 500 $self->grab_focus;
462 501
463 1 502 0
464} 503}
465 504
466sub connect { 505sub connect {
467 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
468 507
469 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
470} 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);
471 528
472sub emit { 529sub emit {
473 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
474 531
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 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
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
478} 550}
479 551
480sub find_widget { 552sub find_widget {
481 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
482 554
… …
490} 562}
491 563
492sub set_parent { 564sub set_parent {
493 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
494 566
495 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
497} 569}
498 570
499sub realloc { 571sub realloc {
500 my ($self) = @_; 572 my ($self) = @_;
… …
534 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
535 607
536 # update screen rectangle 608 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 611
542 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 615
… …
568 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
571 glEnd; 641 glEnd;
572 glPopMatrix; 642 glPopMatrix;
573 #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;
574 } 644 }
575 645
576 $self->_draw; 646 $self->_draw;
577 glPopMatrix; 647 glPopMatrix;
578} 648}
… …
581 my ($self) = @_; 651 my ($self) = @_;
582 652
583 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
584} 654}
585 655
656my $cntx;#d#
586sub DESTROY { 657sub DESTROY {
587 my ($self) = @_; 658 my ($self) = @_;
588 659
589 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
590 661
591 eval { $self->destroy }; 662 eval { $self->destroy };
592 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};
593} 666}
594 667
595############################################################################# 668#############################################################################
596 669
597package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
598 671
599our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
600 673
601use strict; 674use strict;
602use CFClient::OpenGL; 675use CFPlus::OpenGL;
603 676
604sub new { 677sub new {
605 my $class = shift; 678 my $class = shift;
606 679
607 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
638 } 711 }
639} 712}
640 713
641############################################################################# 714#############################################################################
642 715
643package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
644 717
645our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
646 719
647sub new { 720sub new {
648 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
649 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
650} 723}
… …
657 730
658sub draw { } 731sub draw { }
659 732
660############################################################################# 733#############################################################################
661 734
662package CFClient::UI::Container; 735package CFPlus::UI::Container;
663 736
664our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
665 738
666sub new { 739sub new {
667 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
668 741
669 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
678 if $children; 751 if $children;
679 752
680 $self 753 $self
681} 754}
682 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
683sub add { 764sub add {
684 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
685 766
686 $_->set_parent ($self) 767 $_->set_parent ($self)
687 for @widgets; 768 for @widgets;
… …
747 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
748} 829}
749 830
750############################################################################# 831#############################################################################
751 832
752package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
753 834
754our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
755 836
756sub new { 837sub new {
757 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
758 839
759 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760 841
761 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
762} 843}
763 844
764sub add { 845sub add {
… …
771sub remove { 852sub remove {
772 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
773 854
774 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
775 856
776 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
777 unless @{$self->{children}}; 858 unless @{$self->{children}};
778} 859}
779 860
780sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
781 862
… …
793 874
794############################################################################# 875#############################################################################
795 876
796# back-buffered drawing area 877# back-buffered drawing area
797 878
798package CFClient::UI::Window; 879package CFPlus::UI::Window;
799 880
800our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
801 882
802use CFClient::OpenGL; 883use CFPlus::OpenGL;
803 884
804sub new { 885sub new {
805 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
806 887
807 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
829} 910}
830 911
831sub render_child { 912sub render_child {
832 my ($self) = @_; 913 my ($self) = @_;
833 914
834 $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 {
835 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
837 918
838 { 919 {
839 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
840 921
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
843 } 926 }
844
845 $self->_render;
846 }; 927 };
847} 928}
848 929
849sub _draw { 930sub _draw {
850 my ($self) = @_; 931 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 932
854 my $tex = $self->{texture} 933 my $tex = $self->{texture}
855 or return; 934 or return;
856 935
857 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
860 939
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
862 941
863 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
864} 943}
865 944
866############################################################################# 945#############################################################################
867 946
868package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
869 948
870our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
871 950
872sub new { 951sub new {
873 my $class = shift; 952 my $class = shift;
874 953
875 $class->SUPER::new ( 954 $class->SUPER::new (
… …
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 1016 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else { 1018 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 1020 }
942} 1021}
943 1022
944sub _render { 1023sub _render {
945 my ($self) = @_; 1024 my ($self) = @_;
946 1025
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949 1028
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 1030
952 $self->SUPER::_render; 1031 $self->SUPER::_render;
953} 1032}
954 1033
955############################################################################# 1034#############################################################################
956 1035
957package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
958 1037
959our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
960 1039
961sub new { 1040sub new {
962 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
963 1042
964 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
965 1044
966 my $self; 1045 my $self;
967 1046
968 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
969 vertical => 1, 1057 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1059 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973 }, 1062 },
974 ; 1063 ;
975 1064
976 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
978 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
979 %arg, 1072 %arg,
980 ); 1073 );
981 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
983 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
984 1080
985 $self 1081 $self
986} 1082}
1083
1084#TODO# update range on size_allocate depending on child
987 1085
988sub add { 1086sub add {
989 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
990 1088
991 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
992} 1090}
993 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
994sub update { 1116sub update {
995 my ($self) = @_; 1117 my ($self) = @_;
996 1118
997 $self->SUPER::update; 1119 $self->SUPER::update;
998 1120 $self->update_slider;
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1121}
1003 1122
1004sub invoke_size_allocate { 1123sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1006 1125
1007 my $child = $self->{vp}->child; 1126 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1128}
1012 1129
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1130#############################################################################
1017 1131
1018package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1019 1133
1020our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1021 1135
1022use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1023 1137
1024sub new { 1138sub new {
1025 my $class = shift; 1139 my $class = shift;
1026 1140
1027 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1053 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1054} 1168}
1055 1169
1056############################################################################# 1170#############################################################################
1057 1171
1058package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1059 1173
1060our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1061 1175
1062use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1063 1277
1064my $bg = 1278my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1067 1281
1068my @border = 1282my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1285
1072sub new { 1286sub new {
1073 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1074 1288
1075 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1292 border => 0.6,
1079 can_events => 1, 1293 can_events => 1,
1080 min_w => 16, 1294 min_w => 64,
1081 min_h => 16, 1295 min_h => 32,
1082 %arg, 1296 %arg,
1083 ); 1297 );
1084 1298
1085 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1300 align => 0,
1087 valign => 1, 1301 valign => 1,
1088 text => $self->{title}, 1302 text => $self->{title},
1089 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1090 if exists $self->{title}; 1304 if exists $self->{title};
1091 1305
1092 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1307 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1309 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1310 on_activate => sub { $self->emit ("delete") };
1097 1311
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1313 }
1100 1314
1101 $self 1315 $self
1102} 1316}
1103 1317
1104sub add { 1318sub add {
1105 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1106 1320
1107 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110} 1324}
1111 1325
1112sub border { 1326sub border {
1113 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1114} 1328}
… …
1147 $self->child->configure ($border, $border, $w, $h); 1361 $self->child->configure ($border, $border, $w, $h);
1148 1362
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1364 if $self->{close_button};
1151 1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1373
1152 1 1374 1
1153} 1375}
1154 1376
1155sub invoke_button_down { 1377sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1437
1216 ! ! $self->{motion} 1438 ! ! $self->{motion}
1217} 1439}
1218 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1219sub _draw { 1449sub _draw {
1220 my ($self) = @_; 1450 my ($self) = @_;
1221 1451
1222 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1223 1453
… …
1260 if $self->{close_button}; 1490 if $self->{close_button};
1261} 1491}
1262 1492
1263############################################################################# 1493#############################################################################
1264 1494
1265package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1266 1496
1267our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1268 1498
1269use List::Util qw(max sum); 1499use List::Util qw(max sum);
1270 1500
1271use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1272 1502
1273sub new { 1503sub new {
1274 my $class = shift; 1504 my $class = shift;
1275 1505
1276 $class->SUPER::new ( 1506 $class->SUPER::new (
1277 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1278 @_, 1509 @_,
1279 ) 1510 )
1280} 1511}
1281 1512
1282sub children { 1513sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284} 1515}
1285 1516
1286sub add { 1517sub add {
1287 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1288 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1289 $child->set_parent ($self); 1522 $child->set_parent ($self);
1290 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1291 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1292 $self->realloc; 1528 $self->realloc;
1293} 1529}
1294 1530
1295sub remove { 1531sub remove {
1296 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1352 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1353 1589
1354 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1355 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1356 1592
1357 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1358 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1359 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1360 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1361 1597
1362 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1599
1366 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1367 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1368 1609
1369 my $y; 1610 my $y;
1370 1611
1371 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1372 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1415 } 1656 }
1416} 1657}
1417 1658
1418############################################################################# 1659#############################################################################
1419 1660
1420package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1421 1662
1422our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1423 1664
1424sub size_request { 1665sub size_request {
1425 my ($self) = @_; 1666 my ($self) = @_;
1426 1667
1427 $self->{vertical} 1668 $self->{vertical}
… …
1437 1678
1438sub invoke_size_allocate { 1679sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1440 1681
1441 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1443 1684
1444 my @req; 1685 my @req;
1445 1686
1446 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1448 } else { 1689 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1451 1692
1452 if ($req > $space) { 1693 if ($req > $space) {
1453 # ah well, not enough space 1694 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1455 } else { 1696 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1698
1458 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1459 1700
1460 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1702 for 0 .. $#children;
1462 } 1703 }
1463 } 1704 }
1464 1705
1465 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1466 1707
1467 my $pos = 0; 1708 my $pos = 0;
1468 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1712
1472 $pos += $alloc; 1713 $pos += $alloc;
1473 } 1714 }
1474 1715
1475 1 1716 1
1476} 1717}
1477 1718
1478############################################################################# 1719#############################################################################
1479 1720
1480package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1481 1722
1482our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1483 1724
1484sub new { 1725sub new {
1485 my $class = shift; 1726 my $class = shift;
1486 1727
1487 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1490 ) 1731 )
1491} 1732}
1492 1733
1493############################################################################# 1734#############################################################################
1494 1735
1495package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1496 1737
1497our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1498 1739
1499sub new { 1740sub new {
1500 my $class = shift; 1741 my $class = shift;
1501 1742
1502 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1505 ) 1746 )
1506} 1747}
1507 1748
1508############################################################################# 1749#############################################################################
1509 1750
1510package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1511 1752
1512our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1513 1754
1514use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1515 1756
1516sub new { 1757sub new {
1517 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1518 1759
1519 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1763 #active_bg => none
1523 #font => default_font 1764 #font => default_font
1524 #text => initial text 1765 #text => initial text
1525 #markup => initial narkup 1766 #markup => initial narkup
1526 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1527 ellipsise => 3, # end 1769 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1771 fontsize => 1,
1530 align => -1, 1772 align => -1,
1531 valign => -1, 1773 valign => -1,
1532 padding_x => 2, 1774 padding_x => 2,
1533 padding_y => 2, 1775 padding_y => 2,
1534 can_events => 0, 1776 can_events => 0,
1535 %arg 1777 %arg
1536 ); 1778 );
1537 1779
1538 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1783 $self->{template} = $layout;
1542 } 1784 }
1543 1785
1544 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1548 } 1790 }
1549 1791
1550 $self 1792 $self
1551} 1793}
1552 1794
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1795sub update {
1564 my ($self) = @_; 1796 my ($self) = @_;
1565 1797
1566 delete $self->{texture}; 1798 delete $self->{texture};
1567 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1578 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1579 1811
1580 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1582 1814
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1585 1816
1586 delete $self->{size_req}; 1817 delete $self->{size_req};
1587 $self->realloc; 1818 $self->realloc;
1588 $self->update; 1819 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1596 1827
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1829
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1601 1831
1602 delete $self->{size_req}; 1832 delete $self->{size_req};
1603 $self->realloc; 1833 $self->realloc;
1604 $self->update; 1834 $self->update;
… …
1616 1846
1617 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1618 1848
1619 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1853
1623 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1624 1855
1625 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
… …
1630 }; 1861 };
1631 1862
1632 @{ $self->{size_req} } 1863 @{ $self->{size_req} }
1633} 1864}
1634 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1635sub invoke_size_allocate { 1870sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1637 1872
1638 delete $self->{ox}; 1873 delete $self->{ox};
1639 1874
… …
1645 1880
1646sub set_fontsize { 1881sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1648 1883
1649 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1650 delete $self->{texture}; 1886 delete $self->{texture};
1651 1887
1652 $self->realloc; 1888 $self->realloc;
1653} 1889}
1654 1890
1655sub reconfigure { 1891sub reconfigure {
1656 my ($self) = @_; 1892 my ($self) = @_;
1657 1893
1658 delete $self->{size_req}; 1894 delete $self->{size_req};
1895 delete $self->{texture};
1659 1896
1660 $self->SUPER::reconfigure; 1897 $self->SUPER::reconfigure;
1661} 1898}
1662 1899
1663sub _draw { 1900sub _draw {
1664 my ($self) = @_; 1901 my ($self) = @_;
1665 1902
1666 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1667 1904
1668 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1912
1676 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1677 }; 1914 };
1678 1915
1679 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1683 1920
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1924 };
1688 1925
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1928
1694 if ($tex->{format} == GL_ALPHA) { 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 }
1702
1703 glDisable GL_TEXTURE_2D;
1704} 1930}
1705 1931
1706############################################################################# 1932#############################################################################
1707 1933
1708package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1709 1935
1710our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1711 1937
1712use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1713 1939
1714sub new { 1940sub new {
1715 my $class = shift; 1941 my $class = shift;
1716 1942
1717 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1721 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1722 can_hover => 1, 1948 can_hover => 1,
1723 can_focus => 1, 1949 can_focus => 1,
1724 valign => 0, 1950 valign => 0,
1725 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1726 #text => ... 1953 #text => ...
1727 #hidden => "*", 1954 #hidden => "*",
1728 @_ 1955 @_
1729 ) 1956 )
1730} 1957}
… …
1775 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1776 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1777 2004
1778 my $text = $self->get_text; 2005 my $text = $self->get_text;
1779 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1780 if ($uni == 8) { 2009 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1789 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) {
1791 $self->{cursor} = length $text;
1792 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 2033 $self->emit ('escape');
1794 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 2038 } else {
1797 return 0; 2039 return 0;
1798 } 2040 }
1799 2041
1800 $self->_set_text ($text); 2042 $self->_set_text ($text);
1801 2043
1802 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1803 2046
1804 1 2047 1
1805} 2048}
1806 2049
1807sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1819 2062
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2064
1822 # byte-index to char-index 2065 # byte-index to char-index
1823 my $text = $self->{text}; 2066 my $text = $self->{text};
1824 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1826 2069
1827 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1828 $self->update; 2071 $self->update;
1829 2072
1830 1 2073 1
… …
1869 utf8::encode $text; 2112 utf8::encode $text;
1870 2113
1871 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872 } 2115 }
1873 2116
1874 glColor @{$self->{fg}};
1875 glBegin GL_LINES; 2117 glBegin GL_LINES;
1876 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878 glEnd; 2120 glEnd;
1879 } 2121 }
1880} 2122}
1881 2123
2124#############################################################################
2125
1882package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1883 2127
1884our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1885 2129
1886use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1887 2131
1888sub invoke_key_down { 2132sub invoke_key_down {
1889 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1890 2134
1891 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1892 2136
1893 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1896 2140
1897 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1899 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1900 $self->update; 2144 $self->update;
1901 2145
1902 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1905 } 2149 }
1906 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2154 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2156 }
1913 2157
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2161
1918 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1928 1 2172 1
1929} 2173}
1930 2174
1931############################################################################# 2175#############################################################################
1932 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1933package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1934 2217
1935our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1936 2219
1937use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1938 2221
1939my @tex = 2222my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1942 2225
1943sub new { 2226sub new {
1944 my $class = shift; 2227 my $class = shift;
1945 2228
… …
1982 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1983} 2266}
1984 2267
1985############################################################################# 2268#############################################################################
1986 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
1987package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
1988 2420
1989our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
1990 2422
1991use CFClient::OpenGL; 2423use CFPlus::OpenGL;
1992 2424
1993my %textures; 2425my %textures;
1994 2426
1995sub new { 2427sub new {
1996 my $class = shift; 2428 my $class = shift;
… …
2018 1 2450 1
2019} 2451}
2020 2452
2021############################################################################# 2453#############################################################################
2022 2454
2023package CFClient::UI::CheckBox;
2024
2025our @ISA = CFClient::UI::DrawBG::;
2026
2027my @tex =
2028 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2029 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2030
2031use CFClient::OpenGL;
2032
2033sub new {
2034 my $class = shift;
2035
2036 $class->SUPER::new (
2037 padding_x => 2,
2038 padding_y => 2,
2039 fg => [1, 1, 1],
2040 active_fg => [1, 1, 0],
2041 bg => [0, 0, 0, 0.2],
2042 active_bg => [1, 1, 1, 0.5],
2043 state => 0,
2044 can_hover => 1,
2045 @_
2046 )
2047}
2048
2049sub size_request {
2050 my ($self) = @_;
2051
2052 (6) x 2
2053}
2054
2055sub invoke_button_down {
2056 my ($self, $ev, $x, $y) = @_;
2057
2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060 $self->{state} = !$self->{state};
2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
2066 1
2067}
2068
2069sub _draw {
2070 my ($self) = @_;
2071
2072 $self->SUPER::_draw;
2073
2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2075
2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2079
2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2081
2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
2084 glEnable GL_TEXTURE_2D;
2085 $tex->draw_quad_alpha (0, 0, $s, $s);
2086 glDisable GL_TEXTURE_2D;
2087}
2088
2089#############################################################################
2090
2091package CFClient::UI::Image; 2455package CFPlus::UI::VGauge;
2092 2456
2093our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2094
2095use CFClient::OpenGL;
2096use Carp qw/confess/;
2097
2098our %loaded_images;
2099
2100sub new {
2101 my $class = shift;
2102
2103 my $self = $class->SUPER::new (can_events => 0, @_);
2104
2105 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2106
2107 $loaded_images{$self->{image}} ||=
2108 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2109
2110 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2111
2112 Scalar::Util::weaken $loaded_images{$self->{image}};
2113
2114 $self->{aspect} = $tex->{w} / $tex->{h};
2115
2116 $self
2117}
2118
2119sub size_request {
2120 my ($self) = @_;
2121
2122 ($self->{tex}->{w}, $self->{tex}->{h})
2123}
2124
2125sub _draw {
2126 my ($self) = @_;
2127
2128 my $tex = $self->{tex};
2129
2130 my ($w, $h) = ($self->{w}, $self->{h});
2131
2132 if ($self->{rot90}) {
2133 glRotate 90, 0, 0, 1;
2134 glTranslate 0, -$self->{w}, 0;
2135
2136 ($w, $h) = ($h, $w);
2137 }
2138
2139 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141
2142 $tex->draw_quad_alpha (0, 0, $w, $h);
2143
2144 glDisable GL_TEXTURE_2D;
2145}
2146
2147#############################################################################
2148
2149package CFClient::UI::VGauge;
2150
2151our @ISA = CFClient::UI::Base::;
2152 2458
2153use List::Util qw(min max); 2459use List::Util qw(min max);
2154 2460
2155use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2156 2462
2157my %tex = ( 2463my %tex = (
2158 food => [ 2464 food => [
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161 ], 2467 ],
2162 grace => [ 2468 grace => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165 ], 2471 ],
2166 hp => [ 2472 hp => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169 ], 2475 ],
2170 mana => [ 2476 mana => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173 ], 2479 ],
2174); 2480);
2175 2481
2176# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2544
2239 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2240 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241 2550
2242 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2264 2573
2265 if ($t3) { 2574 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2581 glEnd;
2273 } 2582 }
2274 2583
2275 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2276 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2277} 2586}
2278 2587
2279############################################################################# 2588#############################################################################
2280 2589
2281package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2282 2591
2283our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2284 2593
2285sub new { 2594sub new {
2286 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2287 2596
2288 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2290 can_hover => 1, 2599 can_hover => 1,
2291 can_events => 1, 2600 can_events => 1,
2292 %arg, 2601 %arg,
2293 ); 2602 );
2294 2603
2295 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2296 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2297 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298 2607
2299 $self 2608 $self
2300} 2609}
2301 2610
2302sub set_fontsize { 2611sub set_fontsize {
… …
2323 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2324} 2633}
2325 2634
2326############################################################################# 2635#############################################################################
2327 2636
2328package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2329 2638
2330use strict; 2639use strict;
2331 2640
2332use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2333 2642
2334our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2335 2644
2336my @tex = 2645my @tex =
2337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2339 2648
2340sub new { 2649sub new {
2341 my $class = shift; 2650 my $class = shift;
2342 2651
… …
2431 } 2740 }
2432 2741
2433 1 2742 1
2434} 2743}
2435 2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2436sub update { 2757sub update {
2437 my ($self) = @_; 2758 my ($self) = @_;
2438 2759
2439 delete $self->{knob_w}; 2760 delete $self->{knob_w};
2440 $self->SUPER::update; 2761 $self->SUPER::update;
… …
2487 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2488} 2809}
2489 2810
2490############################################################################# 2811#############################################################################
2491 2812
2492package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2493 2814
2494our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2495 2816
2496sub new { 2817sub new {
2497 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2498 2819
2499 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2500 2821
2501 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2502 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504 to_value => sub { shift }, 2825 to_value => sub { shift },
2505 from_value => sub { shift }, 2826 from_value => sub { shift },
2506 %arg, 2827 %arg,
2507 ); 2828 );
2508 2829
… …
2528sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2529sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2530 2851
2531############################################################################# 2852#############################################################################
2532 2853
2533package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2534 2855
2535our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2536 2857
2537use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2538 2859
2539sub new { 2860sub new {
2540 my $class = shift; 2861 my $class = shift;
2541 2862
2542 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2543 fontsize => 1, 2864 fontsize => 1,
2544 can_events => 0, 2865 can_events => 1,
2545 indent => 0, 2866 indent => 0,
2546 #font => default_font 2867 #font => default_font
2547 @_, 2868 @_,
2548 2869
2549 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2550 par => [], 2871 par => [],
2872 max_par => 0,
2551 height => 0, 2873 height => 0,
2552 children => [ 2874 children => [
2553 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2555 ], 2877 ],
2556 ); 2878 );
2557 2879
2558 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2559 2881
… …
2565 2887
2566 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2889 $self->reflow;
2568} 2890}
2569 2891
2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2570sub invoke_size_allocate { 2901sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2572 2903
2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2906
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 2909 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 2911
2578 $self->reflow; 2912 $self->reflow;
2579 2913
2914 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 2915 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 2916}
2582 2917
2583sub text_size { 2918sub invoke_mouse_wheel {
2584 my ($self, $text, $indent) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2585 2930
2586 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2587 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2592 2944 );
2945
2593 $layout->size 2946 $layout
2594} 2947}
2595 2948
2596sub reflow { 2949sub reflow {
2597 my ($self) = @_; 2950 my ($self) = @_;
2598 2951
… …
2605 2958
2606 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2607 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2608} 2961}
2609 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2610sub clear { 2978sub clear {
2611 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2612 2983
2613 $self->{par} = []; 2984 $self->{par} = [];
2614 $self->{height} = 0; 2985 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 2987}
2617 2988
2618sub add_paragraph { 2989sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2620 2991
2621 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2622 my ($w, $h) = $self->text_size ($line); 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
3002
3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2623 $self->{height} += $h; 3044 $self->{height} = $height;
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625 }
2626 3046
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2628} 3053}
2629 3054
2630sub update { 3055sub update {
2631 my ($self) = @_; 3056 my ($self) = @_;
2632 3057
… …
2635 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2636 3061
2637 delete $self->{texture}; 3062 delete $self->{texture};
2638 3063
2639 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 3068
2642 if (delete $self->{need_reflow}) {
2643 my $height = 0;
2644
2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649 for (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653 $layout->set_markup ($_->[4]);
2654 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3];
2656 $_->[1] = $h;
2657 }
2658
2659 $height += $_->[1];
2660 }
2661
2662 $self->{height} = $height;
2663
2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2665
2666 delete $self->{texture};
2667 }
2668
2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2672 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2673 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2674 3082
2675 my $y0 = $top; 3083 my $y0 = $top;
2676 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2677 3085
2678 my $y = 0;
2679
2680 my $layout = $self->{layout};
2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683
2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688 for my $par (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2690 3089
2691 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695 $layout->set_markup ($par->[4]);
2696 3092
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2698 3094
2699 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2701 } 3107 }
2702 3108
2703 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2704 } 3111 }
2705 3112
2706 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2707 }; 3114 };
2708 }); 3115 });
3116}
3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
2709} 3125}
2710 3126
2711sub _draw { 3127sub _draw {
2712 my ($self) = @_; 3128 my ($self) = @_;
2713 3129
… …
2716 glColor 0, 0, 0, 1; 3132 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2719 3135
2720 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2721
2722} 3137}
2723 3138
2724############################################################################# 3139#############################################################################
2725 3140
2726package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2727 3142
2728use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2729 3144
2730our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2731 3146
2732sub moveto { 3147sub moveto {
2733 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2734 3149
2735 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2763 glPopMatrix; 3178 glPopMatrix;
2764} 3179}
2765 3180
2766############################################################################# 3181#############################################################################
2767 3182
2768package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2769 3184
2770our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2771 3186
2772sub new { 3187sub new {
2773 my $class = shift; 3188 my $class = shift;
2774 3189
2775 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2787 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2788} 3203}
2789 3204
2790############################################################################# 3205#############################################################################
2791 3206
2792package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2793 3208
2794our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2795 3210
2796use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2797 3212
2798sub new { 3213sub new {
2799 my $class = shift; 3214 my $class = shift;
2800 3215
2801 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2804 ) 3219 )
2805} 3220}
2806 3221
2807sub set_tooltip_from { 3222sub set_tooltip_from {
2808 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2809 3227
2810 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2811 3229
2812 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2817 } 3235 }
2818 3236
2819 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2821 3239
2822 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2823 markup => $tooltip, 3241 markup => $tooltip,
2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825 fontsize => 0.8, 3243 fontsize => 0.8,
2826 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2827 ellipsise => 0, 3245 ellipsise => 0,
2828 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2829 ); 3247 );
2830} 3248}
2831 3249
… …
2850 3268
2851 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2853 or return; 3271 or return;
2854 3272
3273 if ($widget->{visible}) {
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856 3275
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2859 3278
2860 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2861 }); 3283 });
2862} 3284}
2863 3285
2864sub _draw { 3286sub _draw {
2865 my ($self) = @_; 3287 my ($self) = @_;
… …
2889 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2890} 3312}
2891 3313
2892############################################################################# 3314#############################################################################
2893 3315
2894package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2895 3317
2896our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2897 3319
2898use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2899 3321
2900sub new { 3322sub new {
2901 my $class = shift; 3323 my $class = shift;
2902 3324
2903 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2905 can_events => 0, 3327 can_events => 0,
2906 @_, 3328 @_,
2907 ); 3329 );
2908 3330
2909 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2910 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2911 3333
2912 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2913 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914 hard => 1, 3336 hard => 1,
2915 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2916 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2917 ++$widget->{frame}; 3340 ++$widget->{frame};
2918 $widget->update; 3341 $widget->update;
2919 }, 3342 },
2920 ); 3343 );
2921 } 3344 }
… …
2938sub _draw { 3361sub _draw {
2939 my ($self) = @_; 3362 my ($self) = @_;
2940 3363
2941 return unless $::CONN; 3364 return unless $::CONN;
2942 3365
3366 $self->SUPER::_draw;
3367
2943 my $face; 3368 my $face;
2944 3369
2945 if ($self->{frame}) { 3370 if ($self->{frame}) {
2946 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
2947 3372
2948 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
2949 if $anim && @$anim; 3374 if $anim && @$anim;
2950 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
2951 3379
2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2953 3381
2954 if ($tex) { 3382 if ($tex) {
2955 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2957 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2959 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2960 } 3392 }
2961} 3393}
2962 3394
2963sub destroy { 3395sub destroy {
2964 my ($self) = @_; 3396 my ($self) = @_;
… …
2969 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
2970} 3402}
2971 3403
2972############################################################################# 3404#############################################################################
2973 3405
2974package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
2975 3407
2976our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2977 3409
2978# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
2979 3411
2980############################################################################# 3412#############################################################################
2981 3413
2982package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2983 3415
2984our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2985 3417
2986use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2987 3419
2988sub new { 3420sub new {
2989 my $class = shift; 3421 my $class = shift;
2990 3422
2991 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2992 items => [], 3424 items => [],
2993 z => 100, 3425 z => 100,
2994 @_, 3426 @_,
2995 ); 3427 );
2996 3428
2997 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998 3430
2999 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
3001 3433
3002 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
3003 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
3004 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
3005 can_hover => 1, 3440 can_hover => 1,
3006 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
3007 markup => $widget, 3453 markup => $widget,
3008 tooltip => $tooltip 3454 tooltip => $tooltip;
3455 }
3009 } 3456 }
3010 3457
3011 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
3012 3459
3013 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
3056 1 3503 1
3057} 3504}
3058 3505
3059############################################################################# 3506#############################################################################
3060 3507
3061package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3062 3509
3063our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3064 3511
3065sub new { 3512sub new {
3066 my $class = shift; 3513 my $class = shift;
3067 3514
3068 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
3082 3529
3083 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3531 if @{ $self->{children} };
3085} 3532}
3086 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3087sub set_current_page { 3540sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
3089 3542
3090 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
3091 ? $page_or_widget 3544 ? $page_or_widget
… …
3123 $self->{current}->draw; 3576 $self->{current}->draw;
3124} 3577}
3125 3578
3126############################################################################# 3579#############################################################################
3127 3580
3128package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3129 3582
3130our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3131 3584
3132sub new { 3585sub new {
3133 my $class = shift; 3586 my $class = shift;
3134 3587
3135 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3139 @_, 3592 @_,
3140 ); 3593 );
3141 3594
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3146} 3599}
3147 3600
3148sub add { 3601sub add {
3149 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3150 3603
3151 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3152 3605
3153 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3154 markup => $title, 3607 markup => $title,
3155 tooltip => $tooltip, 3608 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3610 );
3158 3611
3159 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3160} 3613}
3161 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3162sub set_current_page { 3621sub set_current_page {
3163 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3164 3623
3165 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3167} 3626}
3168 3627
3169############################################################################# 3628#############################################################################
3170 3629
3171package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3172 3631
3173use utf8; 3632use utf8;
3174 3633
3175our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3176 3635
3177sub new { 3636sub new {
3178 my $class = shift; 3637 my $class = shift;
3179 3638
3180 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
… …
3197 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3198 3657
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 } 3659 }
3201 3660
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203} 3662}
3204 3663
3205sub _set_value { 3664sub _set_value {
3206 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3207 3666
… …
3222 $self->emit (changed => $value); 3681 $self->emit (changed => $value);
3223} 3682}
3224 3683
3225############################################################################# 3684#############################################################################
3226 3685
3227package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3228 3687
3229our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3230 3689
3231sub new { 3690sub new {
3232 my $class = shift; 3691 my $class = shift;
3233 3692
3234 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3235 fontsize => 0.8, 3694 fontsize => 0.8,
3236 @_, 3695 @_,
3237 ); 3696 );
3238 3697
3239 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3240 3699
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242 3701
3243 $self 3702 $self
3244} 3703}
… …
3246sub reorder { 3705sub reorder {
3247 my ($self) = @_; 3706 my ($self) = @_;
3248 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3249 3708
3250 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3254 3713
3255 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3256 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257 } 3716 }
… …
3278 for ($short) { 3737 for ($short) {
3279 s/^\s+//; 3738 s/^\s+//;
3280 s/\s+/ /g; 3739 s/\s+/ /g;
3281 } 3740 }
3282 3741
3283 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3284 markup => $short, 3743 markup => $short,
3285 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3286 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3287 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3288 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3342 count => 1, 3801 count => 1,
3343 %arg, 3802 %arg,
3344 }; 3803 };
3345 } 3804 }
3346 3805
3806 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3807 $self->reorder;
3808 });
3348} 3809}
3349 3810
3350sub reconfigure { 3811sub reconfigure {
3351 my ($self) = @_; 3812 my ($self) = @_;
3352 3813
… …
3365 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3366} 3827}
3367 3828
3368############################################################################# 3829#############################################################################
3369 3830
3370package CFClient::UI::Inventory;
3371
3372our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3620 @_,
3621 )
3622}
3623
3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3710 my ($self, $spell) = @_;
3711
3712 $self->{spell}->{$spell->{name}} = $spell;
3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3732package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3733 3832
3734our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3735 3834
3736use List::Util qw(min max); 3835use List::Util qw(min max);
3737 3836
3738use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3739 3838
3740sub new { 3839sub new {
3741 my $class = shift; 3840 my $class = shift;
3742 3841
3743 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3744 visible => 1, 3843 visible => 1,
3745 @_, 3844 @_,
3746 ); 3845 );
3747 3846
3748 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3749 3848
3750 $self 3849 $self
3751} 3850}
3752 3851
3753sub size_request { 3852sub size_request {
… …
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 4019
3921 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3922 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3923 4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
3924 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3926 4034
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w}; 4036 $widget->{old_w} = $widget->{w};
… …
3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3953 glLoadIdentity; 4061 glLoadIdentity;
3954 4062
3955 { 4063 {
3956 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3957 4065
3958 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3960 }
3961 4068
3962 $self->_draw; 4069 $self->_draw;
4070 }
3963} 4071}
3964 4072
3965############################################################################# 4073#############################################################################
3966 4074
3967package CFClient::UI; 4075package CFPlus::UI;
3968 4076
3969$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3970$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971 4079
39721 40801
3973 4081

Diff Legend

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