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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
335sub size_request { 365sub size_request {
336 require Carp; 366 require Carp;
337 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
338} 368}
339 369
370sub baseline_shift {
371 0
372}
373
340sub configure { 374sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
342 376
343 if ($self->{aspect}) { 377 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
345 379
346 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 382
349 # use alignment to adjust x, y 383 # use alignment to adjust x, y
350 384
351 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
393 427
394 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
395 429
396 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
397 431
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 435 }
402} 436}
403 437
404# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
405sub coord2local { 439sub coord2local {
406 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
407 441
442 Carp::confess unless $self->{parent};#d#
443
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 445}
410 446
411# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
412sub coord2global { 448sub coord2global {
413 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
414 450
451 Carp::confess unless $self->{parent};#d#
452
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 454}
417 455
418sub invoke_focus_in { 456sub invoke_focus_in {
419 my ($self) = @_; 457 my ($self) = @_;
420 458
421 return if $FOCUS == $self; 459 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
423 461
424 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
425 463
426 $focus->update if $focus; 464 $self->update;
427 $FOCUS->update;
428 465
429 0 466 0
430} 467}
431 468
432sub invoke_focus_out { 469sub invoke_focus_out {
433 my ($self) = @_; 470 my ($self) = @_;
434 471
435 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
436 473
437 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
438 475
439 $focus->update if $focus; #? 476 $self->update;
440 477
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 479 unless $FOCUS;
443 480
444 0 481 0
445} 482}
446 483
447sub grab_focus { 484sub grab_focus {
448 my ($self) = @_; 485 my ($self) = @_;
449 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
451} 489}
452 490
453sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
457 496
458sub invoke_button_down { 497sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
460 499
461 $self->grab_focus; 500 $self->grab_focus;
462 501
463 1 502 0
464} 503}
465 504
466sub connect { 505sub connect {
467 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
468 507
469 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
470} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
471 528
472sub emit { 529sub emit {
473 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
474 531
475 #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 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
979 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
980 %arg, 1072 %arg,
981 ); 1073 );
982 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
984 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
985 1080
986 $self 1081 $self
987} 1082}
1083
1084#TODO# update range on size_allocate depending on child
988 1085
989sub add { 1086sub add {
990 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
991 1088
992 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
993} 1090}
994 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
995sub update { 1116sub update {
996 my ($self) = @_; 1117 my ($self) = @_;
997 1118
998 $self->SUPER::update; 1119 $self->SUPER::update;
999 1120 $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} 1121}
1004 1122
1005sub invoke_size_allocate { 1123sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1007 1125
1008 my $child = $self->{vp}->child; 1126 $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) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1128}
1013 1129
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1130#############################################################################
1018 1131
1019package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1020 1133
1021our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1022 1135
1023use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1024 1137
1025sub new { 1138sub new {
1026 my $class = shift; 1139 my $class = shift;
1027 1140
1028 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1055} 1168}
1056 1169
1057############################################################################# 1170#############################################################################
1058 1171
1059package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1060 1173
1061our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1062 1175
1063use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1064 1277
1065my $bg = 1278my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1068 1281
1069my @border = 1282my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 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); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1285
1073sub new { 1286sub new {
1074 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1075 1288
1076 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1292 border => 0.6,
1080 can_events => 1, 1293 can_events => 1,
1081 min_w => 16, 1294 min_w => 64,
1082 min_h => 16, 1295 min_h => 32,
1083 %arg, 1296 %arg,
1084 ); 1297 );
1085 1298
1086 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1300 align => 0,
1088 valign => 1, 1301 valign => 1,
1089 text => $self->{title}, 1302 text => $self->{title},
1090 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1091 if exists $self->{title}; 1304 if exists $self->{title};
1092 1305
1093 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1307 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1309 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1310 on_activate => sub { $self->emit ("delete") };
1098 1311
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1313 }
1101 1314
1102 $self 1315 $self
1103} 1316}
1104 1317
1105sub add { 1318sub add {
1106 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1107 1320
1108 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1324}
1112 1325
1113sub border { 1326sub border {
1114 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1115} 1328}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1361 $self->child->configure ($border, $border, $w, $h);
1149 1362
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1364 if $self->{close_button};
1152 1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1373
1153 1 1374 1
1154} 1375}
1155 1376
1156sub invoke_button_down { 1377sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1437
1217 ! ! $self->{motion} 1438 ! ! $self->{motion}
1218} 1439}
1219 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1220sub _draw { 1449sub _draw {
1221 my ($self) = @_; 1450 my ($self) = @_;
1222 1451
1223 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1224 1453
… …
1261 if $self->{close_button}; 1490 if $self->{close_button};
1262} 1491}
1263 1492
1264############################################################################# 1493#############################################################################
1265 1494
1266package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1267 1496
1268our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1269 1498
1270use List::Util qw(max sum); 1499use List::Util qw(max sum);
1271 1500
1272use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1273 1502
1274sub new { 1503sub new {
1275 my $class = shift; 1504 my $class = shift;
1276 1505
1277 $class->SUPER::new ( 1506 $class->SUPER::new (
1278 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1279 @_, 1509 @_,
1280 ) 1510 )
1281} 1511}
1282 1512
1283sub children { 1513sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1515}
1286 1516
1287sub add { 1517sub add {
1288 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1289 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1522 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1292 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1528 $self->realloc;
1294} 1529}
1295 1530
1296sub remove { 1531sub remove {
1297 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1353 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1354 1589
1355 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1357 1592
1358 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1359 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1362 1597
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1599
1367 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1368 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1369 1609
1370 my $y; 1610 my $y;
1371 1611
1372 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1416 } 1656 }
1417} 1657}
1418 1658
1419############################################################################# 1659#############################################################################
1420 1660
1421package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1422 1662
1423our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1424 1664
1425sub size_request { 1665sub size_request {
1426 my ($self) = @_; 1666 my ($self) = @_;
1427 1667
1428 $self->{vertical} 1668 $self->{vertical}
… …
1438 1678
1439sub invoke_size_allocate { 1679sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1441 1681
1442 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1444 1684
1445 my @req; 1685 my @req;
1446 1686
1447 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1449 } else { 1689 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1452 1692
1453 if ($req > $space) { 1693 if ($req > $space) {
1454 # ah well, not enough space 1694 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1456 } else { 1696 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1698
1459 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1460 1700
1461 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1702 for 0 .. $#children;
1463 } 1703 }
1464 } 1704 }
1465 1705
1466 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1467 1707
1468 my $pos = 0; 1708 my $pos = 0;
1469 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1712
1473 $pos += $alloc; 1713 $pos += $alloc;
1474 } 1714 }
1475 1715
1476 1 1716 1
1477} 1717}
1478 1718
1479############################################################################# 1719#############################################################################
1480 1720
1481package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1482 1722
1483our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1484 1724
1485sub new { 1725sub new {
1486 my $class = shift; 1726 my $class = shift;
1487 1727
1488 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1491 ) 1731 )
1492} 1732}
1493 1733
1494############################################################################# 1734#############################################################################
1495 1735
1496package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1497 1737
1498our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1499 1739
1500sub new { 1740sub new {
1501 my $class = shift; 1741 my $class = shift;
1502 1742
1503 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1506 ) 1746 )
1507} 1747}
1508 1748
1509############################################################################# 1749#############################################################################
1510 1750
1511package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1512 1752
1513our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1514 1754
1515use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1516 1756
1517sub new { 1757sub new {
1518 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1519 1759
1520 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1763 #active_bg => none
1524 #font => default_font 1764 #font => default_font
1525 #text => initial text 1765 #text => initial text
1526 #markup => initial narkup 1766 #markup => initial narkup
1527 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1528 ellipsise => 3, # end 1769 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1771 fontsize => 1,
1531 align => -1, 1772 align => -1,
1532 valign => -1, 1773 valign => -1,
1533 padding_x => 2, 1774 padding_x => 2,
1534 padding_y => 2, 1775 padding_y => 2,
1535 can_events => 0, 1776 can_events => 0,
1536 %arg 1777 %arg
1537 ); 1778 );
1538 1779
1539 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1783 $self->{template} = $layout;
1543 } 1784 }
1544 1785
1545 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1549 } 1790 }
1550 1791
1551 $self 1792 $self
1552} 1793}
1553 1794
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1795sub update {
1565 my ($self) = @_; 1796 my ($self) = @_;
1566 1797
1567 delete $self->{texture}; 1798 delete $self->{texture};
1568 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1580 1811
1581 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1583 1814
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1586 1816
1587 delete $self->{size_req}; 1817 delete $self->{size_req};
1588 $self->realloc; 1818 $self->realloc;
1589 $self->update; 1819 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1597 1827
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1829
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1602 1831
1603 delete $self->{size_req}; 1832 delete $self->{size_req};
1604 $self->realloc; 1833 $self->realloc;
1605 $self->update; 1834 $self->update;
… …
1617 1846
1618 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1619 1848
1620 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1853
1624 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1625 1855
1626 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
… …
1631 }; 1861 };
1632 1862
1633 @{ $self->{size_req} } 1863 @{ $self->{size_req} }
1634} 1864}
1635 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1636sub invoke_size_allocate { 1870sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1638 1872
1639 delete $self->{ox}; 1873 delete $self->{ox};
1640 1874
… …
1646 1880
1647sub set_fontsize { 1881sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1649 1883
1650 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1651 delete $self->{texture}; 1886 delete $self->{texture};
1652 1887
1653 $self->realloc; 1888 $self->realloc;
1654} 1889}
1655 1890
1656sub reconfigure { 1891sub reconfigure {
1657 my ($self) = @_; 1892 my ($self) = @_;
1658 1893
1659 delete $self->{size_req}; 1894 delete $self->{size_req};
1895 delete $self->{texture};
1660 1896
1661 $self->SUPER::reconfigure; 1897 $self->SUPER::reconfigure;
1662} 1898}
1663 1899
1664sub _draw { 1900sub _draw {
1665 my ($self) = @_; 1901 my ($self) = @_;
1666 1902
1667 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1668 1904
1669 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1912
1677 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1678 }; 1914 };
1679 1915
1680 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1684 1920
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1924 };
1689 1925
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1928
1695 if ($tex->{format} == GL_ALPHA) { 1929 $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} 1930}
1706 1931
1707############################################################################# 1932#############################################################################
1708 1933
1709package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1710 1935
1711our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1712 1937
1713use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1714 1939
1715sub new { 1940sub new {
1716 my $class = shift; 1941 my $class = shift;
1717 1942
1718 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1723 can_hover => 1, 1948 can_hover => 1,
1724 can_focus => 1, 1949 can_focus => 1,
1725 valign => 0, 1950 valign => 0,
1726 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1727 #text => ... 1953 #text => ...
1728 #hidden => "*", 1954 #hidden => "*",
1729 @_ 1955 @_
1730 ) 1956 )
1731} 1957}
… …
1776 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1778 2004
1779 my $text = $self->get_text; 2005 my $text = $self->get_text;
1780 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1781 if ($uni == 8) { 2009 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1790 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2033 $self->emit ('escape');
1795 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2038 } else {
1798 return 0; 2039 return 0;
1799 } 2040 }
1800 2041
1801 $self->_set_text ($text); 2042 $self->_set_text ($text);
1802 2043
1803 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1804 2046
1805 1 2047 1
1806} 2048}
1807 2049
1808sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1820 2062
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2064
1823 # byte-index to char-index 2065 # byte-index to char-index
1824 my $text = $self->{text}; 2066 my $text = $self->{text};
1825 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1827 2069
1828 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1829 $self->update; 2071 $self->update;
1830 2072
1831 1 2073 1
… …
1870 utf8::encode $text; 2112 utf8::encode $text;
1871 2113
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2115 }
1874 2116
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2117 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2120 glEnd;
1880 } 2121 }
1881} 2122}
1882 2123
2124#############################################################################
2125
1883package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1884 2127
1885our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1886 2129
1887use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1888 2131
1889sub invoke_key_down { 2132sub invoke_key_down {
1890 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1891 2134
1892 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1893 2136
1894 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1897 2140
1898 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1901 $self->update; 2144 $self->update;
1902 2145
1903 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1906 } 2149 }
1907 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2154 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2156 }
1914 2157
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2161
1919 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2172 1
1930} 2173}
1931 2174
1932############################################################################# 2175#############################################################################
1933 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1934package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1935 2217
1936our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1937 2219
1938use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1939 2221
1940my @tex = 2222my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1943 2225
1944sub new { 2226sub new {
1945 my $class = shift; 2227 my $class = shift;
1946 2228
… …
1983 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1984} 2266}
1985 2267
1986############################################################################# 2268#############################################################################
1987 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
1988package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
1989 2420
1990our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
1991 2422
1992use CFClient::OpenGL; 2423use CFPlus::OpenGL;
1993 2424
1994my %textures; 2425my %textures;
1995 2426
1996sub new { 2427sub new {
1997 my $class = shift; 2428 my $class = shift;
… …
2019 1 2450 1
2020} 2451}
2021 2452
2022############################################################################# 2453#############################################################################
2023 2454
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; 2455package CFPlus::UI::VGauge;
2093 2456
2094our @ISA = CFClient::UI::Base::; 2457our @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 2458
2154use List::Util qw(min max); 2459use List::Util qw(min max);
2155 2460
2156use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2157 2462
2158my %tex = ( 2463my %tex = (
2159 food => [ 2464 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2467 ],
2163 grace => [ 2468 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 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/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 2471 ],
2167 hp => [ 2472 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2475 ],
2171 mana => [ 2476 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 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/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 2479 ],
2175); 2480);
2176 2481
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2544
2240 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2550
2243 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2265 2573
2266 if ($t3) { 2574 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2581 glEnd;
2274 } 2582 }
2275 2583
2276 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2278} 2586}
2279 2587
2280############################################################################# 2588#############################################################################
2281 2589
2282package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2283 2591
2284our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2285 2593
2286sub new { 2594sub new {
2287 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2288 2596
2289 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2599 can_hover => 1,
2292 can_events => 1, 2600 can_events => 1,
2293 %arg, 2601 %arg,
2294 ); 2602 );
2295 2603
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 2607
2300 $self 2608 $self
2301} 2609}
2302 2610
2303sub set_fontsize { 2611sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2325} 2633}
2326 2634
2327############################################################################# 2635#############################################################################
2328 2636
2329package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2330 2638
2331use strict; 2639use strict;
2332 2640
2333use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2334 2642
2335our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2336 2644
2337my @tex = 2645my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2340 2648
2341sub new { 2649sub new {
2342 my $class = shift; 2650 my $class = shift;
2343 2651
… …
2432 } 2740 }
2433 2741
2434 1 2742 1
2435} 2743}
2436 2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2437sub update { 2757sub update {
2438 my ($self) = @_; 2758 my ($self) = @_;
2439 2759
2440 delete $self->{knob_w}; 2760 delete $self->{knob_w};
2441 $self->SUPER::update; 2761 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2489} 2809}
2490 2810
2491############################################################################# 2811#############################################################################
2492 2812
2493package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2494 2814
2495our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2496 2816
2497sub new { 2817sub new {
2498 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2499 2819
2500 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2501 2821
2502 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2825 to_value => sub { shift },
2506 from_value => sub { shift }, 2826 from_value => sub { shift },
2507 %arg, 2827 %arg,
2508 ); 2828 );
2509 2829
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2531 2851
2532############################################################################# 2852#############################################################################
2533 2853
2534package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2535 2855
2536our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2537 2857
2538use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2539 2859
2540sub new { 2860sub new {
2541 my $class = shift; 2861 my $class = shift;
2542 2862
2543 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2544 fontsize => 1, 2864 fontsize => 1,
2545 can_events => 0, 2865 can_events => 1,
2546 indent => 0, 2866 indent => 0,
2547 #font => default_font 2867 #font => default_font
2548 @_, 2868 @_,
2549 2869
2550 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2551 par => [], 2871 par => [],
2872 max_par => 0,
2552 height => 0, 2873 height => 0,
2553 children => [ 2874 children => [
2554 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2556 ], 2877 ],
2557 ); 2878 );
2558 2879
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2560 2881
… …
2566 2887
2567 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2889 $self->reflow;
2569} 2890}
2570 2891
2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2571sub invoke_size_allocate { 2901sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2573 2903
2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2906
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2909 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2911
2579 $self->reflow; 2912 $self->reflow;
2580 2913
2914 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2915 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2916}
2583 2917
2584sub text_size { 2918sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2586 2930
2587 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2588 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2593 2944 );
2945
2594 $layout->size 2946 $layout
2595} 2947}
2596 2948
2597sub reflow { 2949sub reflow {
2598 my ($self) = @_; 2950 my ($self) = @_;
2599 2951
… …
2606 2958
2607 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2609} 2961}
2610 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2611sub clear { 2978sub clear {
2612 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2613 2983
2614 $self->{par} = []; 2984 $self->{par} = [];
2615 $self->{height} = 0; 2985 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2987}
2618 2988
2619sub add_paragraph { 2989sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2621 2991
2622 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
3002
3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2624 $self->{height} += $h; 3044 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 3046
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2629} 3053}
2630 3054
2631sub update { 3055sub update {
2632 my ($self) = @_; 3056 my ($self) = @_;
2633 3057
… …
2636 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2637 3061
2638 delete $self->{texture}; 3062 delete $self->{texture};
2639 3063
2640 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 3068
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 { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2673 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2674 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2675 3082
2676 my $y0 = $top; 3083 my $y0 = $top;
2677 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2678 3085
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}}) { 3086 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2691 3089
2692 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 3091 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 3092
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2699 3094
2700 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2702 } 3107 }
2703 3108
2704 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2705 } 3111 }
2706 3112
2707 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2708 }; 3114 };
2709 }); 3115 });
3116}
3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
2710} 3125}
2711 3126
2712sub _draw { 3127sub _draw {
2713 my ($self) = @_; 3128 my ($self) = @_;
2714 3129
… …
2717 glColor 0, 0, 0, 1; 3132 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2720 3135
2721 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2722
2723} 3137}
2724 3138
2725############################################################################# 3139#############################################################################
2726 3140
2727package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2728 3142
2729use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2730 3144
2731our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2732 3146
2733sub moveto { 3147sub moveto {
2734 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2735 3149
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 3178 glPopMatrix;
2765} 3179}
2766 3180
2767############################################################################# 3181#############################################################################
2768 3182
2769package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2770 3184
2771our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2772 3186
2773sub new { 3187sub new {
2774 my $class = shift; 3188 my $class = shift;
2775 3189
2776 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2789} 3203}
2790 3204
2791############################################################################# 3205#############################################################################
2792 3206
2793package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2794 3208
2795our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2796 3210
2797use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2798 3212
2799sub new { 3213sub new {
2800 my $class = shift; 3214 my $class = shift;
2801 3215
2802 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2805 ) 3219 )
2806} 3220}
2807 3221
2808sub set_tooltip_from { 3222sub set_tooltip_from {
2809 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2810 3227
2811 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2812 3229
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 3235 }
2819 3236
2820 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2822 3239
2823 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 3241 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3243 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 3245 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 3247 );
2831} 3248}
2832 3249
… …
2851 3268
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2854 or return; 3271 or return;
2855 3272
3273 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3275
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2860 3278
2861 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2862 }); 3283 });
2863} 3284}
2864 3285
2865sub _draw { 3286sub _draw {
2866 my ($self) = @_; 3287 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2891} 3312}
2892 3313
2893############################################################################# 3314#############################################################################
2894 3315
2895package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2896 3317
2897our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2898 3319
2899use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2900 3321
2901sub new { 3322sub new {
2902 my $class = shift; 3323 my $class = shift;
2903 3324
2904 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2906 can_events => 0, 3327 can_events => 0,
2907 @_, 3328 @_,
2908 ); 3329 );
2909 3330
2910 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2912 3333
2913 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1, 3336 hard => 1,
2916 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2917 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2918 ++$widget->{frame}; 3340 ++$widget->{frame};
2919 $widget->update; 3341 $widget->update;
2920 }, 3342 },
2921 ); 3343 );
2922 } 3344 }
… …
2939sub _draw { 3361sub _draw {
2940 my ($self) = @_; 3362 my ($self) = @_;
2941 3363
2942 return unless $::CONN; 3364 return unless $::CONN;
2943 3365
3366 $self->SUPER::_draw;
3367
2944 my $face; 3368 my $face;
2945 3369
2946 if ($self->{frame}) { 3370 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
2948 3372
2949 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim; 3374 if $anim && @$anim;
2951 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
2952 3379
2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2954 3381
2955 if ($tex) { 3382 if ($tex) {
2956 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2960 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2961 } 3392 }
2962} 3393}
2963 3394
2964sub destroy { 3395sub destroy {
2965 my ($self) = @_; 3396 my ($self) = @_;
… …
2970 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
2971} 3402}
2972 3403
2973############################################################################# 3404#############################################################################
2974 3405
2975package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
2976 3407
2977our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2978 3409
2979# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
2980 3411
2981############################################################################# 3412#############################################################################
2982 3413
2983package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2984 3415
2985our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2986 3417
2987use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2988 3419
2989sub new { 3420sub new {
2990 my $class = shift; 3421 my $class = shift;
2991 3422
2992 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2993 items => [], 3424 items => [],
2994 z => 100, 3425 z => 100,
2995 @_, 3426 @_,
2996 ); 3427 );
2997 3428
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3430
3000 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
3002 3433
3003 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
3004 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
3005 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3440 can_hover => 1,
3007 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
3008 markup => $widget, 3453 markup => $widget,
3009 tooltip => $tooltip 3454 tooltip => $tooltip;
3455 }
3010 } 3456 }
3011 3457
3012 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
3013 3459
3014 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
3057 1 3503 1
3058} 3504}
3059 3505
3060############################################################################# 3506#############################################################################
3061 3507
3062package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3063 3509
3064our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3065 3511
3066sub new { 3512sub new {
3067 my $class = shift; 3513 my $class = shift;
3068 3514
3069 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
3083 3529
3084 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3531 if @{ $self->{children} };
3086} 3532}
3087 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3088sub set_current_page { 3540sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
3090 3542
3091 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3544 ? $page_or_widget
… …
3124 $self->{current}->draw; 3576 $self->{current}->draw;
3125} 3577}
3126 3578
3127############################################################################# 3579#############################################################################
3128 3580
3129package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3130 3582
3131our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3132 3584
3133sub new { 3585sub new {
3134 my $class = shift; 3586 my $class = shift;
3135 3587
3136 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3140 @_, 3592 @_,
3141 ); 3593 );
3142 3594
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3147} 3599}
3148 3600
3149sub add { 3601sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3151 3603
3152 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3153 3605
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 3607 markup => $title,
3156 tooltip => $tooltip, 3608 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3610 );
3159 3611
3160 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3161} 3613}
3162 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3163sub set_current_page { 3621sub set_current_page {
3164 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3165 3623
3166 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3626}
3169 3627
3170############################################################################# 3628#############################################################################
3171 3629
3172package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3173 3631
3174use utf8; 3632use utf8;
3175 3633
3176our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3177 3635
3178sub new { 3636sub new {
3179 my $class = shift; 3637 my $class = shift;
3180 3638
3181 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3199 3657
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3659 }
3202 3660
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3662}
3205 3663
3206sub _set_value { 3664sub _set_value {
3207 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3208 3666
… …
3223 $self->emit (changed => $value); 3681 $self->emit (changed => $value);
3224} 3682}
3225 3683
3226############################################################################# 3684#############################################################################
3227 3685
3228package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3229 3687
3230our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3231 3689
3232sub new { 3690sub new {
3233 my $class = shift; 3691 my $class = shift;
3234 3692
3235 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3236 fontsize => 0.8, 3694 fontsize => 0.8,
3237 @_, 3695 @_,
3238 ); 3696 );
3239 3697
3240 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3241 3699
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243 3701
3244 $self 3702 $self
3245} 3703}
… …
3247sub reorder { 3705sub reorder {
3248 my ($self) = @_; 3706 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3250 3708
3251 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3255 3713
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3716 }
… …
3279 for ($short) { 3737 for ($short) {
3280 s/^\s+//; 3738 s/^\s+//;
3281 s/\s+/ /g; 3739 s/\s+/ /g;
3282 } 3740 }
3283 3741
3284 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3285 markup => $short, 3743 markup => $short,
3286 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3801 count => 1,
3344 %arg, 3802 %arg,
3345 }; 3803 };
3346 } 3804 }
3347 3805
3806 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3807 $self->reorder;
3808 });
3349} 3809}
3350 3810
3351sub reconfigure { 3811sub reconfigure {
3352 my ($self) = @_; 3812 my ($self) = @_;
3353 3813
… …
3366 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3367} 3827}
3368 3828
3369############################################################################# 3829#############################################################################
3370 3830
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 commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
3621 @_,
3622 )
3623}
3624
3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
3711 my ($self, $spell) = @_;
3712
3713 $self->{spell}->{$spell->{name}} = $spell;
3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3733package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3734 3832
3735our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3736 3834
3737use List::Util qw(min max); 3835use List::Util qw(min max);
3738 3836
3739use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3740 3838
3741sub new { 3839sub new {
3742 my $class = shift; 3840 my $class = shift;
3743 3841
3744 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3745 visible => 1, 3843 visible => 1,
3746 @_, 3844 @_,
3747 ); 3845 );
3748 3846
3749 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3750 3848
3751 $self 3849 $self
3752} 3850}
3753 3851
3754sub size_request { 3852sub size_request {
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 4019
3922 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3924 4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
3925 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3927 4034
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 4036 $widget->{old_w} = $widget->{w};
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 4061 glLoadIdentity;
3955 4062
3956 { 4063 {
3957 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3958 4065
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4068
3963 $self->_draw; 4069 $self->_draw;
4070 }
3964} 4071}
3965 4072
3966############################################################################# 4073#############################################################################
3967 4074
3968package CFClient::UI; 4075package CFPlus::UI;
3969 4076
3970$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4079
39731 40801
3974 4081

Diff Legend

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