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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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