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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 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 (
… …
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
1500 ellipsise => 3, # end 1623 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1624 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1625 fontsize => 1,
1503 align => -1, 1626 align => -1,
1504 valign => -1, 1627 valign => -1,
1505 padding_x => 2, 1628 padding_x => 2,
1506 padding_y => 2, 1629 padding_y => 2,
1507 can_events => 0, 1630 can_events => 0,
1508 %arg 1631 %arg
1509 ); 1632 );
1510 1633
1511 if (exists $self->{template}) { 1634 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1635 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1636 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1637 $self->{template} = $layout;
1515 } 1638 }
1516 1639
1517 if (exists $self->{markup}) { 1640 if (exists $self->{markup}) {
… …
1521 } 1644 }
1522 1645
1523 $self 1646 $self
1524} 1647}
1525 1648
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1649sub update {
1537 my ($self) = @_; 1650 my ($self) = @_;
1538 1651
1539 delete $self->{texture}; 1652 delete $self->{texture};
1540 $self->SUPER::update; 1653 $self->SUPER::update;
… …
1551 my ($self, $text) = @_; 1664 my ($self, $text) = @_;
1552 1665
1553 return if $self->{text} eq "T$text"; 1666 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1667 $self->{text} = "T$text";
1555 1668
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1669 $self->{layout}->set_text ($text);
1670
1558 delete $self->{req_h}; 1671 delete $self->{size_req};
1559
1560 $self->realloc; 1672 $self->realloc;
1561 $self->update; 1673 $self->update;
1562} 1674}
1563 1675
1564sub set_markup { 1676sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1679 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1680 $self->{text} = "M$markup";
1569 1681
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1682 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1683
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1684 $self->{layout}->set_markup ($markup);
1685
1574 delete $self->{req_h}; 1686 delete $self->{size_req};
1575
1576 $self->realloc; 1687 $self->realloc;
1577 $self->update; 1688 $self->update;
1578} 1689}
1579 1690
1580sub size_request { 1691sub size_request {
1581 my ($self) = @_; 1692 my ($self) = @_;
1582 1693
1583 if (exists $self->{req_h}) { 1694 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1695 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1696 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1697 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1698 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1699 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1700
1592 my ($w, $h) = $self->{layout}->size; 1701 my ($w, $h) = $self->{layout}->size;
1593 1702
1594 if (exists $self->{template}) { 1703 if (exists $self->{template}) {
1595 $self->{template}->set_font ($self->{font}) if $self->{font}; 1704 $self->{template}->set_font ($self->{font}) if $self->{font};
1705 $self->{template}->set_width ($self->{max_w} || -1);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1707
1598 my ($w2, $h2) = $self->{template}->size; 1708 my ($w2, $h2) = $self->{template}->size;
1599 1709
1600 $w = List::Util::max $w, $w2; 1710 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1711 $h = List::Util::max $h, $h2;
1602 } 1712 }
1603 1713
1604 ($w, $h) 1714 [$w, $h]
1605 } 1715 };
1606}
1607 1716
1717 @{ $self->{size_req} }
1718}
1719
1720sub baseline_shift {
1721 $_[0]{layout}->descent
1722}
1723
1608sub size_allocate { 1724sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1725 my ($self, $w, $h) = @_;
1610 1726
1611 delete $self->{ox}; 1727 delete $self->{ox};
1612 1728
1613 delete $self->{texture} 1729 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1730 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1731
1732 1
1615} 1733}
1616 1734
1617sub set_fontsize { 1735sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1736 my ($self, $fontsize) = @_;
1619 1737
1620 $self->{fontsize} = $fontsize; 1738 $self->{fontsize} = $fontsize;
1739 delete $self->{size_req};
1621 delete $self->{texture}; 1740 delete $self->{texture};
1622 1741
1623 $self->realloc; 1742 $self->realloc;
1624} 1743}
1625 1744
1745sub reconfigure {
1746 my ($self) = @_;
1747
1748 delete $self->{size_req};
1749 delete $self->{texture};
1750
1751 $self->SUPER::reconfigure;
1752}
1753
1626sub _draw { 1754sub _draw {
1627 my ($self) = @_; 1755 my ($self) = @_;
1628 1756
1629 $self->SUPER::_draw; # draw background, if applicable 1757 $self->SUPER::_draw; # draw background, if applicable
1630 1758
1631 my $tex = $self->{texture} ||= do { 1759 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 1760 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1761 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 1762 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1763 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1764 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1765 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 1766
1639 new_from_layout CFClient::Texture $self->{layout} 1767 [$self->{layout}->size]
1640 }; 1768 };
1641 1769
1642 unless (exists $self->{ox}) { 1770 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1771 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1772 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 1773 : ($self->{w} - $size->[0]) * 0.5);
1646 1774
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1775 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1776 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1777 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 1778 };
1651 1779
1652 glEnable GL_TEXTURE_2D; 1780 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1781 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1782
1655 glColor_premultiply @{$self->{fg}} 1783 $self->{layout}->render ($self->{ox}, $self->{oy});
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 1784}
1662 1785
1663############################################################################# 1786#############################################################################
1664 1787
1665package CFClient::UI::EntryBase; 1788package CFPlus::UI::EntryBase;
1666 1789
1667our @ISA = CFClient::UI::Label::; 1790our @ISA = CFPlus::UI::Label::;
1668 1791
1669use CFClient::OpenGL; 1792use CFPlus::OpenGL;
1670 1793
1671sub new { 1794sub new {
1672 my $class = shift; 1795 my $class = shift;
1673 1796
1674 $class->SUPER::new ( 1797 $class->SUPER::new (
… …
1679 can_hover => 1, 1802 can_hover => 1,
1680 can_focus => 1, 1803 can_focus => 1,
1681 valign => 0, 1804 valign => 0,
1682 can_events => 1, 1805 can_events => 1,
1683 #text => ... 1806 #text => ...
1807 #hidden => "*",
1684 @_ 1808 @_
1685 ) 1809 )
1686} 1810}
1687 1811
1688sub _set_text { 1812sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1820 $self->{text} = $text;
1697 1821
1698 $text =~ s/./*/g if $self->{hidden}; 1822 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1823 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1824 delete $self->{size_req};
1701 1825
1702 $self->_emit (changed => $self->{text}); 1826 $self->emit (changed => $self->{text});
1703 1827
1704 $self->realloc; 1828 $self->realloc;
1705 $self->update; 1829 $self->update;
1706} 1830}
1707 1831
… …
1722 my ($w, $h) = $self->SUPER::size_request; 1846 my ($w, $h) = $self->SUPER::size_request;
1723 1847
1724 ($w + 1, $h) # add 1 for cursor 1848 ($w + 1, $h) # add 1 for cursor
1725} 1849}
1726 1850
1727sub key_down { 1851sub invoke_key_down {
1728 my ($self, $ev) = @_; 1852 my ($self, $ev) = @_;
1729 1853
1730 my $mod = $ev->{mod}; 1854 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1856 my $uni = $ev->{unicode};
… …
1735 1859
1736 if ($uni == 8) { 1860 if ($uni == 8) {
1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738 } elsif ($uni == 127) { 1862 } elsif ($uni == 127) {
1739 substr $text, $self->{cursor}, 1, ""; 1863 substr $text, $self->{cursor}, 1, "";
1740 } elsif ($sym == CFClient::SDLK_LEFT) { 1864 } elsif ($sym == CFPlus::SDLK_LEFT) {
1741 --$self->{cursor} if $self->{cursor}; 1865 --$self->{cursor} if $self->{cursor};
1742 } elsif ($sym == CFClient::SDLK_RIGHT) { 1866 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1743 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1867 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1868 } elsif ($sym == CFPlus::SDLK_HOME) {
1745 $self->{cursor} = 0; 1869 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1870 } elsif ($sym == CFPlus::SDLK_END) {
1747 $self->{cursor} = length $text; 1871 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1872 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1873 $self->emit ('escape');
1750 } elsif ($uni) { 1874 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1875 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1876 } else {
1753 return 0; 1877 return 0;
1754 } 1878 }
… …
1758 $self->realloc; 1882 $self->realloc;
1759 1883
1760 1 1884 1
1761} 1885}
1762 1886
1763sub focus_in { 1887sub invoke_focus_in {
1764 my ($self) = @_; 1888 my ($self) = @_;
1765 1889
1766 $self->{last_activity} = $::NOW; 1890 $self->{last_activity} = $::NOW;
1767 1891
1768 $self->SUPER::focus_in; 1892 $self->SUPER::invoke_focus_in
1769} 1893}
1770 1894
1771sub button_down { 1895sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1896 my ($self, $ev, $x, $y) = @_;
1773 1897
1774 $self->SUPER::button_down ($ev, $x, $y); 1898 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1899
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1900 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1901
1778 # byte-index to char-index 1902 # byte-index to char-index
1779 my $text = $self->{text}; 1903 my $text = $self->{text};
1780 utf8::encode $text; 1904 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 1905 $self->{cursor} = length $text;
1782 1906
1783 $self->_set_text ($self->{text}); 1907 $self->_set_text ($self->{text});
1784 $self->update; 1908 $self->update;
1785 1909
1786 1 1910 1
1787} 1911}
1788 1912
1789sub mouse_motion { 1913sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1914 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1915# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 1916
1793 0 1917 1
1794} 1918}
1795 1919
1796sub _draw { 1920sub _draw {
1797 my ($self) = @_; 1921 my ($self) = @_;
1798 1922
… …
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1834 glEnd; 1958 glEnd;
1835 } 1959 }
1836} 1960}
1837 1961
1838package CFClient::UI::Entry; 1962package CFPlus::UI::Entry;
1839 1963
1840our @ISA = CFClient::UI::EntryBase::; 1964our @ISA = CFPlus::UI::EntryBase::;
1841 1965
1842use CFClient::OpenGL; 1966use CFPlus::OpenGL;
1843 1967
1844sub key_down { 1968sub invoke_key_down {
1845 my ($self, $ev) = @_; 1969 my ($self, $ev) = @_;
1846 1970
1847 my $sym = $ev->{sym}; 1971 my $sym = $ev->{sym};
1848 1972
1849 if ($sym == 13) { 1973 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1974 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1975 my $txt = $self->get_text;
1976
1852 $self->{history_pointer} = -1; 1977 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1978 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1979 $self->emit (activate => $txt);
1855 $self->update; 1980 $self->update;
1856 1981
1857 } elsif ($sym == CFClient::SDLK_UP) { 1982 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1983 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1984 $self->{history_saveback} = $self->get_text;
1860 } 1985 }
1861 if (@{$self->{history} || []} > 0) { 1986 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 1987 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 1989 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 1990 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1991 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 1992 }
1868 1993
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 1994 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 1995 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1996 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 1997
1873 if ($self->{history_pointer} >= 0) { 1998 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1999 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 2000 } else {
1876 $self->set_text ($self->{history_saveback}); 2001 $self->set_text ($self->{history_saveback});
1877 } 2002 }
1878 2003
1879 } else { 2004 } else {
1880 return $self->SUPER::key_down ($ev) 2005 return $self->SUPER::invoke_key_down ($ev)
1881 } 2006 }
1882 2007
1883 1 2008 1
1884} 2009}
1885 2010
1886############################################################################# 2011#############################################################################
1887 2012
1888package CFClient::UI::Button; 2013package CFPlus::UI::Button;
1889 2014
1890our @ISA = CFClient::UI::Label::; 2015our @ISA = CFPlus::UI::Label::;
1891 2016
1892use CFClient::OpenGL; 2017use CFPlus::OpenGL;
1893 2018
1894my @tex = 2019my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2021 qw(b1_button_active.png);
1897 2022
1898sub new { 2023sub new {
1899 my $class = shift; 2024 my $class = shift;
1900 2025
… …
1909 can_events => 1, 2034 can_events => 1,
1910 @_ 2035 @_
1911 ) 2036 )
1912} 2037}
1913 2038
1914sub activate { }
1915
1916sub button_up { 2039sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1918 2041
1919 $self->emit ("activate") 2042 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2043 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2044 && $y >= 0 && $y < $self->{h};
… …
1939 $self->SUPER::_draw; 2062 $self->SUPER::_draw;
1940} 2063}
1941 2064
1942############################################################################# 2065#############################################################################
1943 2066
1944package CFClient::UI::CheckBox; 2067package CFPlus::UI::CheckBox;
1945 2068
1946our @ISA = CFClient::UI::DrawBG::; 2069our @ISA = CFPlus::UI::DrawBG::;
1947 2070
1948my @tex = 2071my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2073 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2074
1952use CFClient::OpenGL; 2075use CFPlus::OpenGL;
1953 2076
1954sub new { 2077sub new {
1955 my $class = shift; 2078 my $class = shift;
1956 2079
1957 $class->SUPER::new ( 2080 $class->SUPER::new (
… …
1971 my ($self) = @_; 2094 my ($self) = @_;
1972 2095
1973 (6) x 2 2096 (6) x 2
1974} 2097}
1975 2098
2099sub toggle {
2100 my ($self) = @_;
2101
2102 $self->{state} = !$self->{state};
2103 $self->emit (changed => $self->{state});
2104 $self->update;
2105}
2106
1976sub button_down { 2107sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2108 my ($self, $ev, $x, $y) = @_;
1978 2109
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2110 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2111 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2112 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2113 } else {
1984 return 0 2114 return 0
1985 } 2115 }
1986 2116
1987 1 2117 1
… …
2007 glDisable GL_TEXTURE_2D; 2137 glDisable GL_TEXTURE_2D;
2008} 2138}
2009 2139
2010############################################################################# 2140#############################################################################
2011 2141
2012package CFClient::UI::Image; 2142package CFPlus::UI::Image;
2013 2143
2014our @ISA = CFClient::UI::Base::; 2144our @ISA = CFPlus::UI::Base::;
2015 2145
2016use CFClient::OpenGL; 2146use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2147
2019our %loaded_images; 2148our %texture_cache;
2020 2149
2021sub new { 2150sub new {
2022 my $class = shift; 2151 my $class = shift;
2023 2152
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2153 my $self = $class->SUPER::new (
2154 can_events => 0,
2155 @_,
2156 );
2025 2157
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2158 $self->{path} || $self->{tex}
2159 or Carp::croak "'path' or 'tex' attributes required";
2027 2160
2028 $loaded_images{$self->{image}} ||= 2161 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2030 2163
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2164 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2165
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2167
2037 $self 2168 $self
2038} 2169}
2039 2170
2171sub STORABLE_freeze {
2172 my ($self, $cloning) = @_;
2173
2174 $self->{path}
2175 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2176
2177 $self->{path}
2178}
2179
2180sub STORABLE_attach {
2181 my ($self, $cloning, $path) = @_;
2182
2183 $self->new (path => $path)
2184}
2185
2040sub size_request { 2186sub size_request {
2041 my ($self) = @_; 2187 my ($self) = @_;
2042 2188
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2044} 2190}
2045 2191
2046sub _draw { 2192sub _draw {
2047 my ($self) = @_; 2193 my ($self) = @_;
2048 2194
… …
2058 } 2204 }
2059 2205
2060 glEnable GL_TEXTURE_2D; 2206 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2208
2063 $tex->draw_quad_alpha (0, 0, $w, $h); 2209 $tex->draw_quad (0, 0, $w, $h);
2064 2210
2065 glDisable GL_TEXTURE_2D; 2211 glDisable GL_TEXTURE_2D;
2066} 2212}
2067 2213
2068############################################################################# 2214#############################################################################
2069 2215
2216package CFPlus::UI::ImageButton;
2217
2218our @ISA = CFPlus::UI::Image::;
2219
2220use CFPlus::OpenGL;
2221
2222my %textures;
2223
2224sub new {
2225 my $class = shift;
2226
2227 my $self = $class->SUPER::new (
2228 padding_x => 4,
2229 padding_y => 4,
2230 fg => [1, 1, 1],
2231 active_fg => [0, 0, 1],
2232 can_hover => 1,
2233 align => 0,
2234 valign => 0,
2235 can_events => 1,
2236 @_
2237 );
2238}
2239
2240sub invoke_button_up {
2241 my ($self, $ev, $x, $y) = @_;
2242
2243 $self->emit ("activate")
2244 if $x >= 0 && $x < $self->{w}
2245 && $y >= 0 && $y < $self->{h};
2246
2247 1
2248}
2249
2250#############################################################################
2251
2070package CFClient::UI::VGauge; 2252package CFPlus::UI::VGauge;
2071 2253
2072our @ISA = CFClient::UI::Base::; 2254our @ISA = CFPlus::UI::Base::;
2073 2255
2074use List::Util qw(min max); 2256use List::Util qw(min max);
2075 2257
2076use CFClient::OpenGL; 2258use CFPlus::OpenGL;
2077 2259
2078my %tex = ( 2260my %tex = (
2079 food => [ 2261 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2262 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2263 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2264 ],
2083 grace => [ 2265 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2266 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2267 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2086 ], 2268 ],
2087 hp => [ 2269 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2270 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2271 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2272 ],
2091 mana => [ 2273 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2274 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2275 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2094 ], 2276 ],
2095); 2277);
2096 2278
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2279# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2339 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2340 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2341
2160 my $h1 = $self->{h} * (1 - $ycut1); 2342 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2343 my $h2 = $self->{h} * (1 - $ycut2);
2344 my $h3 = $self->{h};
2345
2346 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2347
2163 glEnable GL_BLEND; 2348 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2349 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2350 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2351 glEnable GL_TEXTURE_2D;
… …
2185 2370
2186 if ($t3) { 2371 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2372 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2373 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2374 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2375 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2376 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2377 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2378 glEnd;
2194 } 2379 }
2195 2380
2196 glDisable GL_BLEND; 2381 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2198} 2383}
2199 2384
2200############################################################################# 2385#############################################################################
2201 2386
2202package CFClient::UI::Gauge; 2387package CFPlus::UI::Gauge;
2203 2388
2204our @ISA = CFClient::UI::VBox::; 2389our @ISA = CFPlus::UI::VBox::;
2205 2390
2206sub new { 2391sub new {
2207 my ($class, %arg) = @_; 2392 my ($class, %arg) = @_;
2208 2393
2209 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2396 can_hover => 1,
2212 can_events => 1, 2397 can_events => 1,
2213 %arg, 2398 %arg,
2214 ); 2399 );
2215 2400
2216 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2401 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2217 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2402 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2218 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2403 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2219 2404
2220 $self 2405 $self
2221} 2406}
2222 2407
2223sub set_fontsize { 2408sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2429 $self->{value}->set_text ($val);
2245} 2430}
2246 2431
2247############################################################################# 2432#############################################################################
2248 2433
2249package CFClient::UI::Slider; 2434package CFPlus::UI::Slider;
2250 2435
2251use strict; 2436use strict;
2252 2437
2253use CFClient::OpenGL; 2438use CFPlus::OpenGL;
2254 2439
2255our @ISA = CFClient::UI::DrawBG::; 2440our @ISA = CFPlus::UI::DrawBG::;
2256 2441
2257my @tex = 2442my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2444 qw(s1_slider.png s1_slider_bg.png);
2260 2445
2261sub new { 2446sub new {
2262 my $class = shift; 2447 my $class = shift;
2263 2448
… …
2284 $self->update; 2469 $self->update;
2285 2470
2286 $self 2471 $self
2287} 2472}
2288 2473
2289sub changed { }
2290
2291sub set_range { 2474sub set_range {
2292 my ($self, $range) = @_; 2475 my ($self, $range) = @_;
2293 2476
2294 ($range, $self->{range}) = ($self->{range}, $range); 2477 ($range, $self->{range}) = ($self->{range}, $range);
2295 2478
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2479 if ("@$range" ne "@{$self->{range}}") {
2480 $self->update;
2481 $self->set_value ($self->{range}[0]);
2482 }
2298} 2483}
2299 2484
2300sub set_value { 2485sub set_value {
2301 my ($self, $value) = @_; 2486 my ($self, $value) = @_;
2302 2487
… …
2313 if $unit; 2498 if $unit;
2314 2499
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2500 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2501
2317 if ($value != $old_value) { 2502 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2503 $self->emit (changed => $value);
2319 $self->update; 2504 $self->update;
2320 } 2505 }
2321} 2506}
2322 2507
2323sub size_request { 2508sub size_request {
2324 my ($self) = @_; 2509 my ($self) = @_;
2325 2510
2326 ($self->{req_w}, $self->{req_h}) 2511 ($self->{req_w}, $self->{req_h})
2327} 2512}
2328 2513
2329sub button_down { 2514sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
2331 2516
2332 $self->SUPER::button_down ($ev, $x, $y); 2517 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2518
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2519 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2520
2336 $self->mouse_motion ($ev, $x, $y) 2521 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2522}
2338 2523
2339sub mouse_motion { 2524sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
2341 2526
2342 if ($GRAB == $self) { 2527 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2528 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2529
… …
2350 } else { 2535 } else {
2351 return 0; 2536 return 0;
2352 } 2537 }
2353 2538
2354 1 2539 1
2540}
2541
2542sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_;
2544
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2548
2549 ! ! $delta
2355} 2550}
2356 2551
2357sub update { 2552sub update {
2358 my ($self) = @_; 2553 my ($self) = @_;
2359 2554
… …
2408 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2409} 2604}
2410 2605
2411############################################################################# 2606#############################################################################
2412 2607
2413package CFClient::UI::ValSlider; 2608package CFPlus::UI::ValSlider;
2414 2609
2415our @ISA = CFClient::UI::HBox::; 2610our @ISA = CFPlus::UI::HBox::;
2416 2611
2417sub new { 2612sub new {
2418 my ($class, %arg) = @_; 2613 my ($class, %arg) = @_;
2419 2614
2420 my $range = delete $arg{range}; 2615 my $range = delete $arg{range};
2421 2616
2422 my $self = $class->SUPER::new ( 2617 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2618 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2619 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 2620 to_value => sub { shift },
2426 from_value => sub { shift }, 2621 from_value => sub { shift },
2427 %arg, 2622 %arg,
2428 ); 2623 );
2429 2624
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2644sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2645sub set_value { shift->{slider}->set_value (@_) }
2451 2646
2452############################################################################# 2647#############################################################################
2453 2648
2454package CFClient::UI::TextView; 2649package CFPlus::UI::TextScroller;
2455 2650
2456our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFPlus::UI::HBox::;
2457 2652
2458use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2459 2654
2460sub new { 2655sub new {
2461 my $class = shift; 2656 my $class = shift;
2462 2657
2463 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2464 fontsize => 1, 2659 fontsize => 1,
2465 can_events => 0, 2660 can_events => 1,
2661 indent => 0,
2466 #font => default_font 2662 #font => default_font
2467 @_, 2663 @_,
2468 2664
2469 layout => (new CFClient::Layout 1), 2665 layout => (new CFPlus::Layout),
2470 par => [], 2666 par => [],
2471 height => 0, 2667 height => 0,
2472 children => [ 2668 children => [
2473 (new CFClient::UI::Empty expand => 1), 2669 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 2670 (new CFPlus::UI::Slider vertical => 1),
2475 ], 2671 ],
2476 ); 2672 );
2477 2673
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 2674 $self->{children}[1]->connect (changed => sub { $self->update });
2479 2675
… …
2485 2681
2486 $self->{fontsize} = $fontsize; 2682 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2683 $self->reflow;
2488} 2684}
2489 2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 my ($empty, $slider) = @{ $self->{children} };
2690
2691 local $self->{children} = [$empty, $slider];
2692 $self->SUPER::size_request
2693}
2694
2490sub size_allocate { 2695sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2696 my ($self, $w, $h) = @_;
2492 2697
2493 $self->SUPER::size_allocate ($w, $h); 2698 my ($empty, $slider, @other) = @{ $self->{children} };
2699 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2700
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2701 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2702 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2703 $self->{layout}->set_width ($empty->{w});
2704 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2705
2499 $self->reflow; 2706 $self->reflow;
2500}
2501 2707
2502sub text_size { 2708 local $self->{children} = [$empty, $slider];
2709 $self->SUPER::invoke_size_allocate ($w, $h)
2710}
2711
2712sub invoke_mouse_wheel {
2503 my ($self, $text, $indent) = @_; 2713 my ($self, $ev) = @_;
2714
2715 return 0 unless $ev->{dy}; # only vertical movements
2716
2717 $self->{children}[1]->emit (mouse_wheel => $ev);
2718
2719 1
2720}
2721
2722sub get_layout {
2723 my ($self, $para) = @_;
2504 2724
2505 my $layout = $self->{layout}; 2725 my $layout = $self->{layout};
2506 2726
2727 $layout->set_font ($self->{font}) if $self->{font};
2728 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2729 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2730 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2731 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2732 $layout->set_markup ($para->{markup});
2733
2734 $layout->set_shapes (
2735 map
2736 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2737 @{$para->{widget}}
2510 2738 );
2739
2511 $layout->size 2740 $layout
2512} 2741}
2513 2742
2514sub reflow { 2743sub reflow {
2515 my ($self) = @_; 2744 my ($self) = @_;
2516 2745
… …
2525 $self->{children}[1]->set_value ($offset); 2754 $self->{children}[1]->set_value ($offset);
2526} 2755}
2527 2756
2528sub clear { 2757sub clear {
2529 my ($self) = @_; 2758 my ($self) = @_;
2759
2760 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other;
2530 2762
2531 $self->{par} = []; 2763 $self->{par} = [];
2532 $self->{height} = 0; 2764 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2765 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2766}
2535 2767
2536sub add_paragraph { 2768sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2769 my $self = shift;
2538 2770
2539 for my $line (split /\n/, $text) { 2771 for my $para (@_) {
2540 my ($w, $h) = $self->text_size ($line); 2772 $para = {
2541 $self->{height} += $h; 2773 fg => [1, 1, 1, 1],
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2774 indent => 0,
2543 } 2775 markup => "",
2776 widget => [],
2777 ref $para ? %$para : (markup => $para),
2778 w => 1e10,
2779 wrapped => 1,
2780 };
2544 2781
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para;
2784 }
2785
2786 $self->{need_reflow}++;
2787 $self->update;
2788}
2789
2790sub scroll_to_bottom {
2791 my ($self) = @_;
2792
2793 $self->{scroll_to_bottom} = 1;
2794 $self->update;
2546} 2795}
2547 2796
2548sub update { 2797sub update {
2549 my ($self) = @_; 2798 my ($self) = @_;
2550 2799
… …
2552 2801
2553 return unless $self->{h} > 0; 2802 return unless $self->{h} > 0;
2554 2803
2555 delete $self->{texture}; 2804 delete $self->{texture};
2556 2805
2557 $ROOT->on_post_alloc ($self, sub { 2806 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2808
2560 if (delete $self->{need_reflow}) { 2809 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2810 my $height = 0;
2562 2811
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) { 2812 for my $para (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569 $layout->set_width ($W - $_->[3]); 2814 my $layout = $self->get_layout ($para);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2815 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2816
2573 $_->[1] = $h; 2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2574 } 2820 }
2575 2821
2576 $height += $_->[1]; 2822 $height += $para->{h};
2577 } 2823 }
2578 2824
2579 $self->{height} = $height; 2825 $self->{height} = $height;
2580 2826
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2582 2828
2583 delete $self->{texture}; 2829 delete $self->{texture};
2584 } 2830 }
2585 2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2837 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 2838 glClear GL_COLOR_BUFFER_BIT;
2589 2839
2590 my $top = int $self->{children}[1]{range}[0]; 2840 my $top = int $self->{children}[1]{range}[0];
2591 2841
2592 my $y0 = $top; 2842 my $y0 = $top;
2593 my $y1 = $top + $H; 2843 my $y1 = $top + $H;
2594 2844
2595 my $y = 0; 2845 my $y = 0;
2596 2846
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 2847 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 2848 my $h = $para->{h};
2607 2849
2608 if ($y0 < $y + $h && $y < $y1) { 2850 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 2851
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2852 my $layout = $self->get_layout ($para);
2614 2853
2615 glRasterPos $par->[3], $y - $y0; 2854 $layout->render ($para->{indent}, $y - $y0);
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2855
2856 if (my @w = @{ $para->{widget} }) {
2857 my @s = $layout->get_shapes;
2858
2859 for (@w) {
2860 my ($dx, $dy) = splice @s, 0, 2, ();
2861
2862 $_->{x} = $dx + $para->{indent};
2863 $_->{y} = $dy + $y - $y0;
2864
2865 $_->draw;
2866 }
2867 }
2617 } 2868 }
2618 2869
2619 $y += $h; 2870 $y += $h;
2620 } 2871 }
2621
2622 glDisable GL_BLEND;
2623 }; 2872 };
2624 }); 2873 });
2874}
2875
2876sub reconfigure {
2877 my ($self) = @_;
2878
2879 $self->SUPER::reconfigure;
2880
2881 $_->{w} = 1e10 for @{ $self->{par} };
2882 $self->reflow;
2625} 2883}
2626 2884
2627sub _draw { 2885sub _draw {
2628 my ($self) = @_; 2886 my ($self) = @_;
2629 2887
… …
2632 glColor 0, 0, 0, 1; 2890 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2891 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 2892 glDisable GL_TEXTURE_2D;
2635 2893
2636 $self->{children}[1]->draw; 2894 $self->{children}[1]->draw;
2637
2638} 2895}
2639 2896
2640############################################################################# 2897#############################################################################
2641 2898
2642package CFClient::UI::Animator; 2899package CFPlus::UI::Animator;
2643 2900
2644use CFClient::OpenGL; 2901use CFPlus::OpenGL;
2645 2902
2646our @ISA = CFClient::UI::Bin::; 2903our @ISA = CFPlus::UI::Bin::;
2647 2904
2648sub moveto { 2905sub moveto {
2649 my ($self, $x, $y) = @_; 2906 my ($self, $x, $y) = @_;
2650 2907
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 2936 glPopMatrix;
2680} 2937}
2681 2938
2682############################################################################# 2939#############################################################################
2683 2940
2684package CFClient::UI::Flopper; 2941package CFPlus::UI::Flopper;
2685 2942
2686our @ISA = CFClient::UI::Button::; 2943our @ISA = CFPlus::UI::Button::;
2687 2944
2688sub new { 2945sub new {
2689 my $class = shift; 2946 my $class = shift;
2690 2947
2691 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 2960 $self->{other}->toggle_visibility;
2704} 2961}
2705 2962
2706############################################################################# 2963#############################################################################
2707 2964
2708package CFClient::UI::Tooltip; 2965package CFPlus::UI::Tooltip;
2709 2966
2710our @ISA = CFClient::UI::Bin::; 2967our @ISA = CFPlus::UI::Bin::;
2711 2968
2712use CFClient::OpenGL; 2969use CFPlus::OpenGL;
2713 2970
2714sub new { 2971sub new {
2715 my $class = shift; 2972 my $class = shift;
2716 2973
2717 $class->SUPER::new ( 2974 $class->SUPER::new (
… …
2720 ) 2977 )
2721} 2978}
2722 2979
2723sub set_tooltip_from { 2980sub set_tooltip_from {
2724 my ($self, $widget) = @_; 2981 my ($self, $widget) = @_;
2982
2983 $widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2725 2985
2726 my $tooltip = $widget->{tooltip}; 2986 my $tooltip = $widget->{tooltip};
2727 2987
2728 if ($ENV{CFPLUS_DEBUG} & 2) { 2988 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2989 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2990 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2991 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2992 . "visible $widget->{visible}";
2733 } 2993 }
2734 2994
2995 $tooltip =~ s/^\n+//;
2996 $tooltip =~ s/\n+$//;
2997
2735 $self->add (new CFClient::UI::Label 2998 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 2999 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 3001 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 3002 fg => [0, 0, 0, 1],
2740 ellipsise => 0, 3003 ellipsise => 0,
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3011 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3012
2750 ($w + 4, $h + 4) 3013 ($w + 4, $h + 4)
2751} 3014}
2752 3015
2753sub size_allocate { 3016sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3017 my ($self, $w, $h) = @_;
2755 3018
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3019 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3020}
2758 3021
2759sub visibility_change { 3022sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3023 my ($self, $visible) = @_;
2761 3024
2762 return unless $visible; 3025 return unless $visible;
2763 3026
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3027 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3028 my $widget = $self->{owner}
2766 or return; 3029 or return;
2767 3030
3031 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3032 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3033
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3034 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3035 if $x + $self->{w} > $self->{root}{w};
2772 3036
2773 $self->move_abs ($x, $y); 3037 $self->move_abs ($x, $y);
3038 } else {
3039 $self->hide;
3040 }
2774 }); 3041 });
2775} 3042}
2776 3043
2777sub _draw { 3044sub _draw {
2778 my ($self) = @_; 3045 my ($self) = @_;
… …
2802 $self->SUPER::_draw; 3069 $self->SUPER::_draw;
2803} 3070}
2804 3071
2805############################################################################# 3072#############################################################################
2806 3073
2807package CFClient::UI::Face; 3074package CFPlus::UI::Face;
2808 3075
2809our @ISA = CFClient::UI::Base::; 3076our @ISA = CFPlus::UI::DrawBG::;
2810 3077
2811use CFClient::OpenGL; 3078use CFPlus::OpenGL;
2812 3079
2813sub new { 3080sub new {
2814 my $class = shift; 3081 my $class = shift;
2815 3082
2816 my $self = $class->SUPER::new ( 3083 my $self = $class->SUPER::new (
… …
2851sub _draw { 3118sub _draw {
2852 my ($self) = @_; 3119 my ($self) = @_;
2853 3120
2854 return unless $::CONN; 3121 return unless $::CONN;
2855 3122
3123 $self->SUPER::_draw;
3124
2856 my $face; 3125 my $face;
2857 3126
2858 if ($self->{frame}) { 3127 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}]; 3128 my $anim = $::CONN->{anim}[$self->{anim}];
2860 3129
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3140 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2873 } 3142 }
2874} 3143}
2875 3144
2876sub DESTROY { 3145sub destroy {
2877 my ($self) = @_; 3146 my ($self) = @_;
2878 3147
2879 $self->{timer}->cancel 3148 $self->{timer}->cancel
2880 if $self->{timer}; 3149 if $self->{timer};
2881 3150
2882 $self->SUPER::DESTROY; 3151 $self->SUPER::destroy;
2883} 3152}
2884 3153
2885############################################################################# 3154#############################################################################
2886 3155
2887package CFClient::UI::Buttonbar; 3156package CFPlus::UI::Buttonbar;
2888 3157
2889our @ISA = CFClient::UI::HBox::; 3158our @ISA = CFPlus::UI::HBox::;
2890 3159
2891# TODO: should actualyl wrap buttons and other goodies. 3160# TODO: should actualyl wrap buttons and other goodies.
2892 3161
2893############################################################################# 3162#############################################################################
2894 3163
2895package CFClient::UI::Menu; 3164package CFPlus::UI::Menu;
2896 3165
2897our @ISA = CFClient::UI::FancyFrame::; 3166our @ISA = CFPlus::UI::FancyFrame::;
2898 3167
2899use CFClient::OpenGL; 3168use CFPlus::OpenGL;
2900 3169
2901sub new { 3170sub new {
2902 my $class = shift; 3171 my $class = shift;
2903 3172
2904 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2905 items => [], 3174 items => [],
2906 z => 100, 3175 z => 100,
2907 @_, 3176 @_,
2908 ); 3177 );
2909 3178
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3179 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3180
2912 for my $item (@{ $self->{items} }) { 3181 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3182 my ($widget, $cb, $tooltip) = @$item;
2914 3183
2915 # handle various types of items, only text for now 3184 # handle various types of items, only text for now
2916 if (!ref $widget) { 3185 if (!ref $widget) {
3186 if ($widget =~ /\t/) {
3187 my ($left, $right) = split /\t/, $widget, 2;
3188
2917 $widget = new CFClient::UI::Label 3189 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3190 can_hover => 1,
2919 can_events => 1, 3191 can_events => 1,
3192 tooltip => $tooltip,
3193 children => [
3194 (new CFPlus::UI::Label markup => $left, expand => 1),
3195 (new CFPlus::UI::Label markup => $right, align => +1),
3196 ],
3197 ;
3198
3199 } else {
3200 $widget = new CFPlus::UI::Label
3201 can_hover => 1,
3202 can_events => 1,
2920 text => $widget; 3203 markup => $widget,
3204 tooltip => $tooltip;
3205 }
2921 } 3206 }
2922 3207
2923 $self->{item}{$widget} = $item; 3208 $self->{item}{$widget} = $item;
2924 3209
2925 $self->{vbox}->add ($widget); 3210 $self->{vbox}->add ($widget);
… …
2930 3215
2931# popup given the event (must be a mouse button down event currently) 3216# popup given the event (must be a mouse button down event currently)
2932sub popup { 3217sub popup {
2933 my ($self, $ev) = @_; 3218 my ($self, $ev) = @_;
2934 3219
2935 $self->_emit ("popdown"); 3220 $self->emit ("popdown");
2936 3221
2937 # maybe save $GRAB? must be careful about events... 3222 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3223 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3224 $self->{button} = $ev->{button};
2940 3225
2941 $self->show; 3226 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3227 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3228}
2944 3229
2945sub mouse_motion { 3230sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3231 my ($self, $ev, $x, $y) = @_;
2947 3232
2948 # TODO: should use vbox->find_widget or so 3233 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3234 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3235 $self->{hover} = $self->{item}{$HOVER};
2951 3236
2952 0 3237 0
2953} 3238}
2954 3239
2955sub button_up { 3240sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3241 my ($self, $ev, $x, $y) = @_;
2957 3242
2958 if ($ev->{button} == $self->{button}) { 3243 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3244 undef $GRAB;
2960 $self->hide; 3245 $self->hide;
2961 3246
2962 $self->_emit ("popdown"); 3247 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3248 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3249 } else {
2965 return 0 3250 return 0
2966 } 3251 }
2967 3252
2968 1 3253 1
2969} 3254}
2970 3255
2971############################################################################# 3256#############################################################################
2972 3257
2973package CFClient::UI::Multiplexer; 3258package CFPlus::UI::Multiplexer;
2974 3259
2975our @ISA = CFClient::UI::Container::; 3260our @ISA = CFPlus::UI::Container::;
2976 3261
2977sub new { 3262sub new {
2978 my $class = shift; 3263 my $class = shift;
2979 3264
2980 my $self = $class->SUPER::new ( 3265 my $self = $class->SUPER::new (
… …
2994 3279
2995 $self->{current} = $self->{children}[0] 3280 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3281 if @{ $self->{children} };
2997} 3282}
2998 3283
3284sub get_current_page {
3285 my ($self) = @_;
3286
3287 $self->{current}
3288}
3289
2999sub set_current_page { 3290sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3291 my ($self, $page_or_widget) = @_;
3001 3292
3002 my $widget = ref $page_or_widget 3293 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3294 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3295 : $self->{children}[$page_or_widget];
3005 3296
3006 $self->{current} = $widget; 3297 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3298 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3299
3009 $self->_emit (page_changed => $self->{current}); 3300 $self->emit (page_changed => $self->{current});
3010 3301
3011 $self->realloc; 3302 $self->realloc;
3012} 3303}
3013 3304
3014sub visible_children { 3305sub visible_children {
… …
3019 my ($self) = @_; 3310 my ($self) = @_;
3020 3311
3021 $self->{current}->size_request 3312 $self->{current}->size_request
3022} 3313}
3023 3314
3024sub size_allocate { 3315sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3316 my ($self, $w, $h) = @_;
3026 3317
3027 $self->{current}->configure (0, 0, $w, $h); 3318 $self->{current}->configure (0, 0, $w, $h);
3319
3320 1
3028} 3321}
3029 3322
3030sub _draw { 3323sub _draw {
3031 my ($self) = @_; 3324 my ($self) = @_;
3032 3325
3033 $self->{current}->draw; 3326 $self->{current}->draw;
3034} 3327}
3035 3328
3036############################################################################# 3329#############################################################################
3037 3330
3038package CFClient::UI::Notebook; 3331package CFPlus::UI::Notebook;
3039 3332
3040our @ISA = CFClient::UI::VBox::; 3333our @ISA = CFPlus::UI::VBox::;
3041 3334
3042sub new { 3335sub new {
3043 my $class = shift; 3336 my $class = shift;
3044 3337
3045 my $self = $class->SUPER::new ( 3338 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3339 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self 3341 # filter => # will be put between multiplexer and $self
3049 @_, 3342 @_,
3050 ); 3343 );
3051 3344
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3058sub add { 3351sub add {
3059 my ($self, $title, $widget, $tooltip) = @_; 3352 my ($self, $title, $widget, $tooltip) = @_;
3060 3353
3061 Scalar::Util::weaken $self; 3354 Scalar::Util::weaken $self;
3062 3355
3063 $self->{buttonbar}->add (new CFClient::UI::Button 3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3064 markup => $title, 3357 markup => $title,
3065 tooltip => $tooltip, 3358 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) }, 3359 on_activate => sub { $self->set_current_page ($widget) },
3067 ); 3360 );
3068 3361
3069 $self->{multiplexer}->add ($widget); 3362 $self->{multiplexer}->add ($widget);
3070} 3363}
3071 3364
3365sub get_current_page {
3366 my ($self) = @_;
3367
3368 $self->{multiplexer}->get_current_page
3369}
3370
3072sub set_current_page { 3371sub set_current_page {
3073 my ($self, $page) = @_; 3372 my ($self, $page) = @_;
3074 3373
3075 $self->{multiplexer}->set_current_page ($page); 3374 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3375 $self->emit (page_changed => $self->{multiplexer}{current});
3077} 3376}
3078 3377
3079############################################################################# 3378#############################################################################
3080 3379
3380package CFPlus::UI::Selector;
3381
3382use utf8;
3383
3384our @ISA = CFPlus::UI::Button::;
3385
3386sub new {
3387 my $class = shift;
3388
3389 my $self = $class->SUPER::new (
3390 options => [], # [value, title, longdesc], ...
3391 value => undef,
3392 @_,
3393 );
3394
3395 $self->_set_value ($self->{value});
3396
3397 $self
3398}
3399
3400sub invoke_button_down {
3401 my ($self, $ev) = @_;
3402
3403 my @menu_items;
3404
3405 for (@{ $self->{options} }) {
3406 my ($value, $title, $tooltip) = @$_;
3407
3408 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3409 }
3410
3411 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3412}
3413
3414sub _set_value {
3415 my ($self, $value) = @_;
3416
3417 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3418 or return;
3419
3420 $self->{value} = $item->[0];
3421 $self->set_markup ("$item->[1] ⇓");
3422 $self->set_tooltip ($item->[2]);
3423}
3424
3425sub set_value {
3426 my ($self, $value) = @_;
3427
3428 return unless $self->{value} ne $value;
3429
3430 $self->_set_value ($value);
3431 $self->emit (changed => $value);
3432}
3433
3434#############################################################################
3435
3081package CFClient::UI::Statusbox; 3436package CFPlus::UI::Statusbox;
3082 3437
3083our @ISA = CFClient::UI::VBox::; 3438our @ISA = CFPlus::UI::VBox::;
3084 3439
3085sub new { 3440sub new {
3086 my $class = shift; 3441 my $class = shift;
3087 3442
3088 my $self = $class->SUPER::new ( 3443 my $self = $class->SUPER::new (
… …
3100sub reorder { 3455sub reorder {
3101 my ($self) = @_; 3456 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 3457 my $NOW = Time::HiRes::time;
3103 3458
3104 # freeze display when hovering over any label 3459 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 3460 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3461 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 3462 values %{ $self->{item} };
3108 3463
3109 while (my ($k, $v) = each %{ $self->{item} }) { 3464 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3465 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 3466 }
… …
3132 for ($short) { 3487 for ($short) {
3133 s/^\s+//; 3488 s/^\s+//;
3134 s/\s+/ /g; 3489 s/\s+/ /g;
3135 } 3490 }
3136 3491
3137 new CFClient::UI::Label 3492 new CFPlus::UI::Label
3138 markup => $short, 3493 markup => $short,
3139 tooltip => $item->{tooltip}, 3494 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 3495 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 3496 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 3497 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3180 $item->{count}++; 3535 $item->{count}++;
3181 } else { 3536 } else {
3182 $item->{count} = 1; 3537 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3538 $item->{text} = $item->{tooltip} = $text;
3184 } 3539 }
3185 $item->{id} = ++$self->{id}; 3540 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3541 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3542 delete $item->{label};
3188 } else { 3543 } else {
3189 $self->{item}{$group} = { 3544 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3545 id => ++$self->{id},
… …
3196 count => 1, 3551 count => 1,
3197 %arg, 3552 %arg,
3198 }; 3553 };
3199 } 3554 }
3200 3555
3556 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3557 $self->reorder;
3558 });
3202} 3559}
3203 3560
3204sub reconfigure { 3561sub reconfigure {
3205 my ($self) = @_; 3562 my ($self) = @_;
3206 3563
… …
3209 3566
3210 $self->reorder; 3567 $self->reorder;
3211 $self->SUPER::reconfigure; 3568 $self->SUPER::reconfigure;
3212} 3569}
3213 3570
3214sub DESTROY { 3571sub destroy {
3215 my ($self) = @_; 3572 my ($self) = @_;
3216 3573
3217 $self->{timer}->cancel; 3574 $self->{timer}->cancel;
3218 3575
3219 $self->SUPER::DESTROY; 3576 $self->SUPER::destroy;
3220} 3577}
3221 3578
3222############################################################################# 3579#############################################################################
3223 3580
3224package CFClient::UI::Inventory; 3581package CFPlus::UI::Inventory;
3225 3582
3226our @ISA = CFClient::UI::ScrolledWindow::; 3583our @ISA = CFPlus::UI::Table::;
3227 3584
3228sub new { 3585sub new {
3229 my $class = shift; 3586 my $class = shift;
3230 3587
3231 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3589 col_expand => [0, 1, 0],
3590 items => [],
3233 @_, 3591 @_,
3234 ); 3592 );
3235 3593
3594 $self->set_sort_order (undef);
3595
3236 $self 3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3237} 3632}
3238 3633
3239sub set_items { 3634sub set_items {
3240 my ($self, $items) = @_; 3635 my ($self, $items) = @_;
3241 3636
3242 $self->{child}->clear; 3637 $self->{items} = [$items ? values %$items : ()];
3243 return unless $items; 3638 $self->update_items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262} 3639}
3263 3640
3264############################################################################# 3641#############################################################################
3265 3642
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList; 3643package CFPlus::UI::SpellList;
3464 3644
3465our @ISA = CFClient::UI::Table::; 3645our @ISA = CFPlus::UI::Table::;
3466 3646
3467sub new { 3647sub new {
3468 my $class = shift; 3648 my $class = shift;
3469 3649
3470 my $self = $class->SUPER::new ( 3650 my $self = $class->SUPER::new (
… …
3472 commands => [], 3652 commands => [],
3473 @_, 3653 @_,
3474 ) 3654 )
3475} 3655}
3476 3656
3477# XXX: Do sorting? Argl... 3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3478sub add_spell { 3742sub add_spell {
3479 my ($self, $spell) = @_; 3743 my ($self, $spell) = @_;
3744
3480 $self->{spells}->{$spell->{name}} = $spell; 3745 $self->{spell}->{$spell->{name}} = $spell;
3481 3746 $self->rebuild_spell_list;
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509} 3747}
3510 3748
3511sub remove_spell { 3749sub remove_spell {
3512 my ($self, $spell) = @_; 3750 my ($self, $spell) = @_;
3751
3513 delete $self->{spells}->{$spell->{name}}; 3752 delete $self->{spell}->{$spell->{name}};
3514 $self->rebuild_spell_list; 3753 $self->rebuild_spell_list;
3515} 3754}
3516 3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3517############################################################################# 3763#############################################################################
3518 3764
3519package CFClient::UI::Root; 3765package CFPlus::UI::Root;
3520 3766
3521our @ISA = CFClient::UI::Container::; 3767our @ISA = CFPlus::UI::Container::;
3522 3768
3523use List::Util qw(min max); 3769use List::Util qw(min max);
3524 3770
3525use CFClient::OpenGL; 3771use CFPlus::OpenGL;
3526 3772
3527sub new { 3773sub new {
3528 my $class = shift; 3774 my $class = shift;
3529 3775
3530 my $self = $class->SUPER::new ( 3776 my $self = $class->SUPER::new (
… …
3555 $coord = $max - $size if $coord > $max - $size; 3801 $coord = $max - $size if $coord > $max - $size;
3556 3802
3557 int $coord + 0.5 3803 int $coord + 0.5
3558} 3804}
3559 3805
3560sub size_allocate { 3806sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3807 my ($self, $w, $h) = @_;
3562 3808
3563 for my $child ($self->children) { 3809 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3810 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3811
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3815 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3816 $Y = _to_pixel $Y, $H, $self->{h};
3571 3817
3572 $child->configure ($X, $Y, $W, $H); 3818 $child->configure ($X, $Y, $W, $H);
3573 } 3819 }
3820
3821 1
3574} 3822}
3575 3823
3576sub coord2local { 3824sub coord2local {
3577 my ($self, $x, $y) = @_; 3825 my ($self, $x, $y) = @_;
3578 3826
… …
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 3953
3706 $w = 0 if $w < 0; 3954 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0; 3955 $h = 0 if $h < 0;
3708 3956
3957 $w = max $widget->{min_w}, $w;
3958 $h = max $widget->{min_h}, $h;
3959
3960# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962
3963 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965
3709 $w = int $w + 0.5; 3966 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 3967 $h = int $h + 0.5;
3711 3968
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3969 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w}; 3970 $widget->{old_w} = $widget->{w};
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3993 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 3994 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 3995 glLoadIdentity;
3739 3996
3740 { 3997 {
3741 package CFClient::UI::Base; 3998 package CFPlus::UI::Base;
3742 3999
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 4000 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 4001 (0, 0, $self->{w}, $self->{h});
3745 } 4002 }
3746 4003
3747 $self->_draw; 4004 $self->_draw;
3748} 4005}
3749 4006
3750############################################################################# 4007#############################################################################
3751 4008
3752package CFClient::UI; 4009package CFPlus::UI;
3753 4010
3754$ROOT = new CFClient::UI::Root; 4011$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4012$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4013
37571 40141
3758 4015

Diff Legend

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