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.309 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC

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

Diff Legend

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