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.374 by root, Mon Jul 16 12:36: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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
979 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
980 %arg, 1073 %arg,
981 ); 1074 );
982 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
984 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
985 1085
986 $self 1086 $self
987} 1087}
1088
1089#TODO# update range on size_allocate depending on child
988 1090
989sub add { 1091sub add {
990 my ($self, $widget) = @_; 1092 my ($self, $widget) = @_;
991 1093
992 $self->{vp}->add ($self->{child} = $widget); 1094 $self->{vp}->add ($self->{child} = $widget);
993} 1095}
994 1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
995sub update { 1131sub update {
996 my ($self) = @_; 1132 my ($self) = @_;
997 1133
998 $self->SUPER::update; 1134 $self->SUPER::update;
999 1135 $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} 1136}
1004 1137
1005sub invoke_size_allocate { 1138sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1007 1140
1008 my $child = $self->{vp}->child; 1141 $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) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1143}
1013 1144
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1145#############################################################################
1018 1146
1019package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1020 1148
1021our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1022 1150
1023use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1024 1152
1025sub new { 1153sub new {
1026 my $class = shift; 1154 my $class = shift;
1027 1155
1028 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1055} 1183}
1056 1184
1057############################################################################# 1185#############################################################################
1058 1186
1059package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1060 1188
1061our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1062 1190
1063use CFClient::OpenGL; 1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1064 1292
1065my $bg = 1293my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1295 mipmap => 1, wrap => 1;
1068 1296
1069my @border = 1297my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1298 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); 1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1300
1073sub new { 1301sub new {
1074 my ($class, %arg) = @_; 1302 my ($class, %arg) = @_;
1075 1303
1076 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1307 border => 0.6,
1080 can_events => 1, 1308 can_events => 1,
1081 min_w => 16, 1309 min_w => 64,
1082 min_h => 16, 1310 min_h => 32,
1083 %arg, 1311 %arg,
1084 ); 1312 );
1085 1313
1086 $self->{title_widget} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1315 align => 0,
1088 valign => 1, 1316 valign => 1,
1089 text => $self->{title}, 1317 text => $self->{title},
1090 fontsize => $self->{border}, 1318 fontsize => $self->{border},
1091 if exists $self->{title}; 1319 if exists $self->{title};
1092 1320
1093 if ($self->{has_close_button}) { 1321 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1322 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1323 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1324 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1325 on_activate => sub { $self->emit ("delete") };
1098 1326
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1328 }
1101 1329
1102 $self 1330 $self
1103} 1331}
1104 1332
1105sub add { 1333sub add {
1106 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1107 1335
1108 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1337 $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}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1339}
1112 1340
1113sub border { 1341sub border {
1114 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1115} 1343}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1376 $self->child->configure ($border, $border, $w, $h);
1149 1377
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1379 if $self->{close_button};
1152 1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1388
1153 1 1389 1
1154} 1390}
1155 1391
1156sub invoke_button_down { 1392sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1452
1217 ! ! $self->{motion} 1453 ! ! $self->{motion}
1218} 1454}
1219 1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1462}
1463
1220sub _draw { 1464sub _draw {
1221 my ($self) = @_; 1465 my ($self) = @_;
1222 1466
1223 my $child = $self->{children}[0]; 1467 my $child = $self->{children}[0];
1224 1468
… …
1261 if $self->{close_button}; 1505 if $self->{close_button};
1262} 1506}
1263 1507
1264############################################################################# 1508#############################################################################
1265 1509
1266package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1267 1511
1268our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1269 1513
1270use List::Util qw(max sum); 1514use List::Util qw(max sum);
1271 1515
1272use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1273 1517
1274sub new { 1518sub new {
1275 my $class = shift; 1519 my $class = shift;
1276 1520
1277 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1278 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1279 @_, 1525 @_,
1280 ) 1526 )
1281} 1527}
1282 1528
1283sub children { 1529sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1531}
1286 1532
1533# TODO: store row/col info in child widget and use standard add/del
1287sub add { 1534sub add {
1288 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1289 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1539 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1292 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1545 $self->realloc;
1294} 1546}
1295 1547
1296sub remove { 1548sub remove {
1297 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1298 1550
1299 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1300} 1556}
1301 1557
1302# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1303sub clear { 1559sub clear {
1304 my ($self) = @_; 1560 my ($self) = @_;
… …
1353 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1354 1610
1355 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1357 1613
1358 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1359 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1362 1618
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1620
1367 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1368 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1369 1630
1370 my $y; 1631 my $y;
1371 1632
1372 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1416 } 1677 }
1417} 1678}
1418 1679
1419############################################################################# 1680#############################################################################
1420 1681
1421package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1422 1683
1684use List::Util qw(min max);
1685
1423our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1424 1767
1425sub size_request { 1768sub size_request {
1426 my ($self) = @_; 1769 my ($self) = @_;
1427 1770
1428 $self->{vertical} 1771 $self->{vertical}
… …
1438 1781
1439sub invoke_size_allocate { 1782sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1441 1784
1442 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1444 1787
1445 my @req; 1788 my @req;
1446 1789
1447 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1449 } else { 1792 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1452 1795
1453 if ($req > $space) { 1796 if ($req > $space) {
1454 # ah well, not enough space 1797 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1456 } else { 1799 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1801
1459 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1460 1803
1461 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1805 for 0 .. $#children;
1463 } 1806 }
1464 } 1807 }
1465 1808
1466 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1467 1810
1468 my $pos = 0; 1811 my $pos = 0;
1469 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1815
1473 $pos += $alloc; 1816 $pos += $alloc;
1474 } 1817 }
1475 1818
1476 1 1819 1
1477} 1820}
1478 1821
1479############################################################################# 1822#############################################################################
1480 1823
1481package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1482 1825
1483our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1484 1827
1485sub new { 1828sub new {
1486 my $class = shift; 1829 my $class = shift;
1487 1830
1488 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1491 ) 1834 )
1492} 1835}
1493 1836
1494############################################################################# 1837#############################################################################
1495 1838
1496package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1497 1840
1498our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1499 1842
1500sub new { 1843sub new {
1501 my $class = shift; 1844 my $class = shift;
1502 1845
1503 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1506 ) 1849 )
1507} 1850}
1508 1851
1509############################################################################# 1852#############################################################################
1510 1853
1511package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1512 1855
1513our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1514 1857
1515use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1516 1859
1517sub new { 1860sub new {
1518 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1519 1862
1520 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1866 #active_bg => none
1524 #font => default_font 1867 #font => default_font
1525 #text => initial text 1868 #text => initial text
1526 #markup => initial narkup 1869 #markup => initial narkup
1527 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1528 ellipsise => 3, # end 1872 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1874 fontsize => 1,
1531 align => -1, 1875 align => -1,
1532 valign => -1, 1876 valign => -1,
1533 padding_x => 2, 1877 padding_x => 2,
1534 padding_y => 2, 1878 padding_y => 2,
1535 can_events => 0, 1879 can_events => 0,
1536 %arg 1880 %arg
1537 ); 1881 );
1538 1882
1539 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1886 $self->{template} = $layout;
1543 } 1887 }
1544 1888
1545 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1549 } 1893 }
1550 1894
1551 $self 1895 $self
1552} 1896}
1553 1897
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1898sub update {
1565 my ($self) = @_; 1899 my ($self) = @_;
1566 1900
1567 delete $self->{texture}; 1901 delete $self->{texture};
1568 $self->SUPER::update; 1902 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1580 1914
1581 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1583 1917
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1586 1919
1587 delete $self->{size_req}; 1920 delete $self->{size_req};
1588 $self->realloc; 1921 $self->realloc;
1589 $self->update; 1922 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1597 1930
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1932
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1602 1934
1603 delete $self->{size_req}; 1935 delete $self->{size_req};
1604 $self->realloc; 1936 $self->realloc;
1605 $self->update; 1937 $self->update;
… …
1617 1949
1618 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1619 1951
1620 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1956
1624 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1625 1958
1626 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
… …
1631 }; 1964 };
1632 1965
1633 @{ $self->{size_req} } 1966 @{ $self->{size_req} }
1634} 1967}
1635 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1636sub invoke_size_allocate { 1973sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1638 1975
1639 delete $self->{ox}; 1976 delete $self->{ox};
1640 1977
… …
1646 1983
1647sub set_fontsize { 1984sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1649 1986
1650 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1651 delete $self->{texture}; 1989 delete $self->{texture};
1652 1990
1653 $self->realloc; 1991 $self->realloc;
1654} 1992}
1655 1993
1656sub reconfigure { 1994sub reconfigure {
1657 my ($self) = @_; 1995 my ($self) = @_;
1658 1996
1659 delete $self->{size_req}; 1997 delete $self->{size_req};
1998 delete $self->{texture};
1660 1999
1661 $self->SUPER::reconfigure; 2000 $self->SUPER::reconfigure;
1662} 2001}
1663 2002
1664sub _draw { 2003sub _draw {
1665 my ($self) = @_; 2004 my ($self) = @_;
1666 2005
1667 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1668 2007
1669 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2015
1677 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1678 }; 2017 };
1679 2018
1680 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1684 2023
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2027 };
1689 2028
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 2031
1695 if ($tex->{format} == GL_ALPHA) { 2032 $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} 2033}
1706 2034
1707############################################################################# 2035#############################################################################
1708 2036
1709package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1710 2038
1711our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1712 2040
1713use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1714 2042
1715sub new { 2043sub new {
1716 my $class = shift; 2044 my $class = shift;
1717 2045
1718 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1723 can_hover => 1, 2051 can_hover => 1,
1724 can_focus => 1, 2052 can_focus => 1,
1725 valign => 0, 2053 valign => 0,
1726 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1727 #text => ... 2056 #text => ...
1728 #hidden => "*", 2057 #hidden => "*",
1729 @_ 2058 @_
1730 ) 2059 )
1731} 2060}
… …
1776 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1778 2107
1779 my $text = $self->get_text; 2108 my $text = $self->get_text;
1780 2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111
1781 if ($uni == 8) { 2112 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1790 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2136 $self->emit ('escape');
1795 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2141 } else {
1798 return 0; 2142 return 0;
1799 } 2143 }
1800 2144
1801 $self->_set_text ($text); 2145 $self->_set_text ($text);
1802 2146
1803 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1804 2149
1805 1 2150 1
1806} 2151}
1807 2152
1808sub invoke_focus_in { 2153sub invoke_focus_in {
… …
1820 2165
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2167
1823 # byte-index to char-index 2168 # byte-index to char-index
1824 my $text = $self->{text}; 2169 my $text = $self->{text};
1825 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1827 2172
1828 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1829 $self->update; 2174 $self->update;
1830 2175
1831 1 2176 1
… …
1870 utf8::encode $text; 2215 utf8::encode $text;
1871 2216
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2218 }
1874 2219
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2220 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 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}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2223 glEnd;
1880 } 2224 }
1881} 2225}
1882 2226
2227#############################################################################
2228
1883package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1884 2230
1885our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1886 2232
1887use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1888 2234
1889sub invoke_key_down { 2235sub invoke_key_down {
1890 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1891 2237
1892 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1893 2239
1894 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
1897 2243
1898 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2246 $self->emit (activate => $txt);
1901 $self->update; 2247 $self->update;
1902 2248
1903 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1906 } 2252 }
1907 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2257 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2259 }
1914 2260
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2264
1919 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2275 1
1930} 2276}
1931 2277
1932############################################################################# 2278#############################################################################
1933 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1934package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1935 2320
1936our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1937 2322
1938use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1939 2324
1940my @tex = 2325my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1943 2328
1944sub new { 2329sub new {
1945 my $class = shift; 2330 my $class = shift;
1946 2331
… …
1983 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1984} 2369}
1985 2370
1986############################################################################# 2371#############################################################################
1987 2372
2373package CFPlus::UI::CheckBox;
2374
2375our @ISA = CFPlus::UI::DrawBG::;
2376
2377my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2380
2381use CFPlus::OpenGL;
2382
2383sub new {
2384 my $class = shift;
2385
2386 $class->SUPER::new (
2387 padding_x => 2,
2388 padding_y => 2,
2389 fg => [1, 1, 1],
2390 active_fg => [1, 1, 0],
2391 bg => [0, 0, 0, 0.2],
2392 active_bg => [1, 1, 1, 0.5],
2393 state => 0,
2394 can_hover => 1,
2395 @_
2396 )
2397}
2398
2399sub size_request {
2400 my ($self) = @_;
2401
2402 (6) x 2
2403}
2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
2413sub invoke_button_down {
2414 my ($self, $ev, $x, $y) = @_;
2415
2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2418 $self->toggle;
2419 } else {
2420 return 0
2421 }
2422
2423 1
2424}
2425
2426sub _draw {
2427 my ($self) = @_;
2428
2429 $self->SUPER::_draw;
2430
2431 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2432
2433 my ($w, $h) = @$self{qw(w h)};
2434
2435 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2436
2437 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2438
2439 my $tex = $self->{state} ? $tex[1] : $tex[0];
2440
2441 glEnable GL_TEXTURE_2D;
2442 $tex->draw_quad_alpha (0, 0, $s, $s);
2443 glDisable GL_TEXTURE_2D;
2444}
2445
2446#############################################################################
2447
2448package CFPlus::UI::Image;
2449
2450our @ISA = CFPlus::UI::Base::;
2451
2452use CFPlus::OpenGL;
2453
2454our %texture_cache;
2455
2456sub new {
2457 my $class = shift;
2458
2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
2463
2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2466
2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2469
2470 CFPlus::weaken $texture_cache{$self->{path}};
2471
2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2473
2474 $self
2475}
2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2492sub size_request {
2493 my ($self) = @_;
2494
2495 ($self->{tex}{w}, $self->{tex}{h})
2496}
2497
2498sub _draw {
2499 my ($self) = @_;
2500
2501 my $tex = $self->{tex};
2502
2503 my ($w, $h) = ($self->{w}, $self->{h});
2504
2505 if ($self->{rot90}) {
2506 glRotate 90, 0, 0, 1;
2507 glTranslate 0, -$self->{w}, 0;
2508
2509 ($w, $h) = ($h, $w);
2510 }
2511
2512 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514
2515 $tex->draw_quad (0, 0, $w, $h);
2516
2517 glDisable GL_TEXTURE_2D;
2518}
2519
2520#############################################################################
2521
1988package CFClient::UI::ImageButton; 2522package CFPlus::UI::ImageButton;
1989 2523
1990our @ISA = CFClient::UI::Image::; 2524our @ISA = CFPlus::UI::Image::;
1991 2525
1992use CFClient::OpenGL; 2526use CFPlus::OpenGL;
1993 2527
1994my %textures; 2528my %textures;
1995 2529
1996sub new { 2530sub new {
1997 my $class = shift; 2531 my $class = shift;
… …
2019 1 2553 1
2020} 2554}
2021 2555
2022############################################################################# 2556#############################################################################
2023 2557
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; 2558package CFPlus::UI::VGauge;
2093 2559
2094our @ISA = CFClient::UI::Base::; 2560our @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 2561
2154use List::Util qw(min max); 2562use List::Util qw(min max);
2155 2563
2156use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2157 2565
2158my %tex = ( 2566my %tex = (
2159 food => [ 2567 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2570 ],
2163 grace => [ 2571 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 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/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166 ], 2574 ],
2167 hp => [ 2575 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2578 ],
2171 mana => [ 2579 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 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/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174 ], 2582 ],
2175); 2583);
2176 2584
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2647
2240 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2653
2243 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
… …
2265 2676
2266 if ($t3) { 2677 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2684 glEnd;
2274 } 2685 }
2275 2686
2276 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2278} 2689}
2279 2690
2280############################################################################# 2691#############################################################################
2281 2692
2282package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2283 2694
2284our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2285 2696
2286sub new { 2697sub new {
2287 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2288 2699
2289 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2702 can_hover => 1,
2292 can_events => 1, 2703 can_events => 1,
2293 %arg, 2704 %arg,
2294 ); 2705 );
2295 2706
2296 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $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); 2708 $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"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299 2710
2300 $self 2711 $self
2301} 2712}
2302 2713
2303sub set_fontsize { 2714sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2325} 2736}
2326 2737
2327############################################################################# 2738#############################################################################
2328 2739
2329package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2330 2741
2331use strict; 2742use strict;
2332 2743
2333use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2334 2745
2335our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2336 2747
2337my @tex = 2748my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2340 2751
2341sub new { 2752sub new {
2342 my $class = shift; 2753 my $class = shift;
2343 2754
… …
2432 } 2843 }
2433 2844
2434 1 2845 1
2435} 2846}
2436 2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2858}
2859
2437sub update { 2860sub update {
2438 my ($self) = @_; 2861 my ($self) = @_;
2439 2862
2440 delete $self->{knob_w}; 2863 delete $self->{knob_w};
2441 $self->SUPER::update; 2864 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2489} 2912}
2490 2913
2491############################################################################# 2914#############################################################################
2492 2915
2493package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2494 2917
2495our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2496 2919
2497sub new { 2920sub new {
2498 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2499 2922
2500 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2501 2924
2502 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2928 to_value => sub { shift },
2506 from_value => sub { shift }, 2929 from_value => sub { shift },
2507 %arg, 2930 %arg,
2508 ); 2931 );
2509 2932
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2531 2954
2532############################################################################# 2955#############################################################################
2533 2956
2534package CFClient::UI::TextScroller; 2957package CFPlus::UI::TextScroller;
2535 2958
2536our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2537 2960
2538use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2539 2962
2540sub new { 2963sub new {
2541 my $class = shift; 2964 my $class = shift;
2542 2965
2543 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2544 fontsize => 1, 2967 fontsize => 1,
2545 can_events => 0, 2968 can_events => 1,
2546 indent => 0, 2969 indent => 0,
2547 #font => default_font 2970 #font => default_font
2548 @_, 2971 @_,
2549 2972
2550 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2551 par => [], 2974 par => [],
2975 max_par => 0,
2552 height => 0, 2976 height => 0,
2553 children => [ 2977 children => [
2554 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2556 ], 2980 ],
2557 ); 2981 );
2558 2982
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2560 2984
… …
2566 2990
2567 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2992 $self->reflow;
2569} 2993}
2570 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2571sub invoke_size_allocate { 3004sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2573 3006
3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3009
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 3014
2579 $self->reflow; 3015 $self->reflow;
2580 3016
3017 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 3018 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 3019}
2583 3020
2584sub text_size { 3021sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2586 3033
2587 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2588 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2593 3047 );
3048
2594 $layout->size 3049 $layout
2595} 3050}
2596 3051
2597sub reflow { 3052sub reflow {
2598 my ($self) = @_; 3053 my ($self) = @_;
2599 3054
… …
2606 3061
2607 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2609} 3064}
2610 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2611sub clear { 3081sub clear {
2612 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2613 3086
2614 $self->{par} = []; 3087 $self->{par} = [];
2615 $self->{height} = 0; 3088 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 3090}
2618 3091
2619sub add_paragraph { 3092sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2621 3094
2622 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2623 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2624 $self->{height} += $h; 3147 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 3149
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2629} 3156}
2630 3157
2631sub update { 3158sub update {
2632 my ($self) = @_; 3159 my ($self) = @_;
2633 3160
… …
2636 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2637 3164
2638 delete $self->{texture}; 3165 delete $self->{texture};
2639 3166
2640 $ROOT->on_post_alloc ($self => sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 3171
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 { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2673 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2674 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2675 3185
2676 my $y0 = $top; 3186 my $y0 = $top;
2677 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2678 3188
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}}) { 3189 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2691 3192
2692 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 3194 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 3195
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2699 3197
2700 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2702 } 3210 }
2703 3211
2704 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2705 } 3214 }
2706 3215
2707 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2708 }; 3217 };
2709 }); 3218 });
3219}
3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
2710} 3228}
2711 3229
2712sub _draw { 3230sub _draw {
2713 my ($self) = @_; 3231 my ($self) = @_;
2714 3232
… …
2717 glColor 0, 0, 0, 1; 3235 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2720 3238
2721 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2722
2723} 3240}
2724 3241
2725############################################################################# 3242#############################################################################
2726 3243
2727package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2728 3245
2729use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2730 3247
2731our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2732 3249
2733sub moveto { 3250sub moveto {
2734 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2735 3252
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 3281 glPopMatrix;
2765} 3282}
2766 3283
2767############################################################################# 3284#############################################################################
2768 3285
2769package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2770 3287
2771our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2772 3289
2773sub new { 3290sub new {
2774 my $class = shift; 3291 my $class = shift;
2775 3292
2776 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2789} 3306}
2790 3307
2791############################################################################# 3308#############################################################################
2792 3309
2793package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2794 3311
2795our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2796 3313
2797use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2798 3315
2799sub new { 3316sub new {
2800 my $class = shift; 3317 my $class = shift;
2801 3318
2802 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2805 ) 3322 )
2806} 3323}
2807 3324
2808sub set_tooltip_from { 3325sub set_tooltip_from {
2809 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2810 3330
2811 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2812 3332
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 3338 }
2819 3339
2820 $tooltip =~ s/^\n+//; 3340 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 3341 $tooltip =~ s/\n+$//;
2822 3342
2823 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 3344 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3346 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 3348 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 3350 );
2831} 3351}
2832 3352
… …
2851 3371
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2854 or return; 3374 or return;
2855 3375
3376 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3378
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3380 if $x + $self->{w} > $self->{root}{w};
2860 3381
2861 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2862 }); 3386 });
2863} 3387}
2864 3388
2865sub _draw { 3389sub _draw {
2866 my ($self) = @_; 3390 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2891} 3415}
2892 3416
2893############################################################################# 3417#############################################################################
2894 3418
2895package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2896 3420
2897our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2898 3422
2899use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2900 3424
2901sub new { 3425sub new {
2902 my $class = shift; 3426 my $class = shift;
2903 3427
2904 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2905 aspect => 1, 3431 aspect => 1,
2906 can_events => 0, 3432 can_events => 0,
2907 @_, 3433 @_,
2908 ); 3434 );
2909 3435
2910 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2912 3438
2913 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1, 3441 hard => 1,
2916 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2917 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2918 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2919 $widget->update; 3448 $self->update;
2920 }, 3449 },
2921 ); 3450 );
3451
3452 $self->update_face;
2922 } 3453 }
2923 3454
2924 $self 3455 $self
2925} 3456}
2926 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2927sub size_request { 3471sub size_request {
2928 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2929} 3487}
2930 3488
2931sub update { 3489sub update {
2932 my ($self) = @_; 3490 my ($self) = @_;
2933 3491
… …
2939sub _draw { 3497sub _draw {
2940 my ($self) = @_; 3498 my ($self) = @_;
2941 3499
2942 return unless $::CONN; 3500 return unless $::CONN;
2943 3501
2944 my $face; 3502 $self->SUPER::_draw;
2945 3503
2946 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2948 3505 or return;
2949 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim;
2951 }
2952 3506
2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2954 3508
2955 if ($tex) { 3509 if ($tex) {
2956 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
2970 $self->SUPER::destroy; 3524 $self->SUPER::destroy;
2971} 3525}
2972 3526
2973############################################################################# 3527#############################################################################
2974 3528
2975package CFClient::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
2976 3530
2977our @ISA = CFClient::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
2978 3532
2979# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
2980 3534
2981############################################################################# 3535#############################################################################
2982 3536
2983package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2984 3538
2985our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2986 3540
2987use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2988 3542
2989sub new { 3543sub new {
2990 my $class = shift; 3544 my $class = shift;
2991 3545
2992 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2993 items => [], 3547 items => [],
2994 z => 100, 3548 z => 100,
2995 @_, 3549 @_,
2996 ); 3550 );
2997 3551
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3553
3000 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
3002 3556
3003 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
3004 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
3005 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3563 can_hover => 1,
3007 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
3008 markup => $widget, 3576 markup => $widget,
3009 tooltip => $tooltip 3577 tooltip => $tooltip;
3578 }
3010 } 3579 }
3011 3580
3012 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
3013 3582
3014 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
3057 1 3626 1
3058} 3627}
3059 3628
3060############################################################################# 3629#############################################################################
3061 3630
3062package CFClient::UI::Multiplexer; 3631package CFPlus::UI::Multiplexer;
3063 3632
3064our @ISA = CFClient::UI::Container::; 3633our @ISA = CFPlus::UI::Container::;
3065 3634
3066sub new { 3635sub new {
3067 my $class = shift; 3636 my $class = shift;
3068 3637
3069 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
… …
3083 3652
3084 $self->{current} = $self->{children}[0] 3653 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3654 if @{ $self->{children} };
3086} 3655}
3087 3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3088sub set_current_page { 3663sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3664 my ($self, $page_or_widget) = @_;
3090 3665
3091 my $widget = ref $page_or_widget 3666 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3667 ? $page_or_widget
… …
3124 $self->{current}->draw; 3699 $self->{current}->draw;
3125} 3700}
3126 3701
3127############################################################################# 3702#############################################################################
3128 3703
3129package CFClient::UI::Notebook; 3704package CFPlus::UI::Notebook;
3130 3705
3131our @ISA = CFClient::UI::VBox::; 3706our @ISA = CFPlus::UI::VBox::;
3132 3707
3133sub new { 3708sub new {
3134 my $class = shift; 3709 my $class = shift;
3135 3710
3136 my $self = $class->SUPER::new ( 3711 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3712 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3714 # filter => # will be put between multiplexer and $self
3140 @_, 3715 @_,
3141 ); 3716 );
3142 3717
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3147} 3722}
3148 3723
3149sub add { 3724sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3151 3726
3152 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3153 3728
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 3730 markup => $title,
3156 tooltip => $tooltip, 3731 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3733 );
3159 3734
3160 $self->{multiplexer}->add ($widget); 3735 $self->{multiplexer}->add ($widget);
3161} 3736}
3162 3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3163sub set_current_page { 3744sub set_current_page {
3164 my ($self, $page) = @_; 3745 my ($self, $page) = @_;
3165 3746
3166 $self->{multiplexer}->set_current_page ($page); 3747 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3748 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3749}
3169 3750
3170############################################################################# 3751#############################################################################
3171 3752
3172package CFClient::UI::Combobox; 3753package CFPlus::UI::Selector;
3173 3754
3174use utf8; 3755use utf8;
3175 3756
3176our @ISA = CFClient::UI::Button::; 3757our @ISA = CFPlus::UI::Button::;
3177 3758
3178sub new { 3759sub new {
3179 my $class = shift; 3760 my $class = shift;
3180 3761
3181 my $self = $class->SUPER::new ( 3762 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3779 my ($value, $title, $tooltip) = @$_;
3199 3780
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3782 }
3202 3783
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3785}
3205 3786
3206sub _set_value { 3787sub _set_value {
3207 my ($self, $value) = @_; 3788 my ($self, $value) = @_;
3208 3789
… …
3223 $self->emit (changed => $value); 3804 $self->emit (changed => $value);
3224} 3805}
3225 3806
3226############################################################################# 3807#############################################################################
3227 3808
3228package CFClient::UI::Statusbox; 3809package CFPlus::UI::Statusbox;
3229 3810
3230our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3231 3812
3232sub new { 3813sub new {
3233 my $class = shift; 3814 my $class = shift;
3234 3815
3235 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3236 fontsize => 0.8, 3817 fontsize => 0.8,
3237 @_, 3818 @_,
3238 ); 3819 );
3239 3820
3240 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3241 3822
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243 3824
3244 $self 3825 $self
3245} 3826}
… …
3247sub reorder { 3828sub reorder {
3248 my ($self) = @_; 3829 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3830 my $NOW = Time::HiRes::time;
3250 3831
3251 # freeze display when hovering over any label 3832 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3833 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3835 values %{ $self->{item} };
3255 3836
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3839 }
… …
3279 for ($short) { 3860 for ($short) {
3280 s/^\s+//; 3861 s/^\s+//;
3281 s/\s+/ /g; 3862 s/\s+/ /g;
3282 } 3863 }
3283 3864
3284 new CFClient::UI::Label 3865 new CFPlus::UI::Label
3285 markup => $short, 3866 markup => $short,
3286 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3924 count => 1,
3344 %arg, 3925 %arg,
3345 }; 3926 };
3346 } 3927 }
3347 3928
3929 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3930 $self->reorder;
3931 });
3349} 3932}
3350 3933
3351sub reconfigure { 3934sub reconfigure {
3352 my ($self) = @_; 3935 my ($self) = @_;
3353 3936
… …
3366 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3367} 3950}
3368 3951
3369############################################################################# 3952#############################################################################
3370 3953
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; 3954package CFPlus::UI::Root;
3734 3955
3735our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3736 3957
3737use List::Util qw(min max); 3958use List::Util qw(min max);
3738 3959
3739use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3740 3961
3741sub new { 3962sub new {
3742 my $class = shift; 3963 my $class = shift;
3743 3964
3744 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3745 visible => 1, 3966 visible => 1,
3746 @_, 3967 @_,
3747 ); 3968 );
3748 3969
3749 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3750 3971
3751 $self 3972 $self
3752} 3973}
3753 3974
3754sub size_request { 3975sub size_request {
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 4142
3922 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3924 4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
3925 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3927 4157
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 4159 $widget->{old_w} = $widget->{w};
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 4184 glLoadIdentity;
3955 4185
3956 { 4186 {
3957 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3958 4188
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4191
3963 $self->_draw; 4192 $self->_draw;
4193 }
3964} 4194}
3965 4195
3966############################################################################# 4196#############################################################################
3967 4197
3968package CFClient::UI; 4198package CFPlus::UI;
3969 4199
3970$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4202
39731 42031
3974 4204

Diff Legend

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