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.361 by root, Sat Dec 9 02:21:25 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};
… …
238 262
239sub destroy { 263sub destroy {
240 my ($self) = @_; 264 my ($self) = @_;
241 265
242 $self->hide; 266 $self->hide;
267 $self->emit ("destroy");
243 %$self = (); 268 %$self = ();
244} 269}
245 270
246sub show { 271sub show {
247 my ($self) = @_; 272 my ($self) = @_;
248 273
249 return if $self->{parent}; 274 return if $self->{parent};
250 275
251 $CFClient::UI::ROOT->add ($self); 276 $CFPlus::UI::ROOT->add ($self);
252} 277}
253 278
254sub set_visible { 279sub set_visible {
255 my ($self) = @_; 280 my ($self) = @_;
256 281
… …
271 296
272 return unless $self->{visible}; 297 return unless $self->{visible};
273 298
274 $_->set_invisible for $self->children; 299 $_->set_invisible for $self->children;
275 300
301 delete $self->{visible};
276 delete $self->{root}; 302 delete $self->{root};
277 delete $self->{visible};
278 303
279 undef $GRAB if $GRAB == $self; 304 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 305 undef $HOVER if $HOVER == $self;
281 306
282 CFClient::UI::check_tooltip 307 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 308 if $TOOLTIP->{owner} == $self;
284 309
285 $self->focus_out; 310 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 311 $self->emit (visibility_change => 0);
288} 312}
289 313
290sub set_visibility { 314sub set_visibility {
291 my ($self, $visible) = @_; 315 my ($self, $visible) = @_;
… …
314} 338}
315 339
316sub move_abs { 340sub move_abs {
317 my ($self, $x, $y, $z) = @_; 341 my ($self, $x, $y, $z) = @_;
318 342
319 $self->{x} = List::Util::max 0, int $x; 343 $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; 344 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 345 $self->{z} = $z if defined $z;
322 346
323 $self->update; 347 $self->update;
324} 348}
325 349
… …
335sub size_request { 359sub size_request {
336 require Carp; 360 require Carp;
337 Carp::confess "size_request is abstract"; 361 Carp::confess "size_request is abstract";
338} 362}
339 363
364sub baseline_shift {
365 0
366}
367
340sub configure { 368sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 369 my ($self, $x, $y, $w, $h) = @_;
342 370
343 if ($self->{aspect}) { 371 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 372 my ($ow, $oh) = ($w, $h);
345 373
346 $w = List::Util::min $w, int $h * $self->{aspect}; 374 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 375 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 376
349 # use alignment to adjust x, y 377 # use alignment to adjust x, y
350 378
351 $x += int 0.5 * ($ow - $w); 379 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 380 $y += int 0.5 * ($oh - $h);
… …
366 394
367 $self->{root}{size_alloc}{$self+0} = $self; 395 $self->{root}{size_alloc}{$self+0} = $self;
368 } 396 }
369} 397}
370 398
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 399sub children {
376 # nop 400 # nop
377} 401}
378 402
379sub visible_children { 403sub visible_children {
… …
397 421
398 return if $self->{tooltip} eq $tooltip; 422 return if $self->{tooltip} eq $tooltip;
399 423
400 $self->{tooltip} = $tooltip; 424 $self->{tooltip} = $tooltip;
401 425
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 426 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 427 delete $CFPlus::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 428 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 429 }
406} 430}
407 431
408# translate global coordinates to local coordinate system 432# translate global coordinates to local coordinate system
409sub coord2local { 433sub coord2local {
410 my ($self, $x, $y) = @_; 434 my ($self, $x, $y) = @_;
411 435
436 Carp::confess unless $self->{parent};#d#
437
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 438 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 439}
414 440
415# translate local coordinates to global coordinate system 441# translate local coordinates to global coordinate system
416sub coord2global { 442sub coord2global {
417 my ($self, $x, $y) = @_; 443 my ($self, $x, $y) = @_;
418 444
445 Carp::confess unless $self->{parent};#d#
446
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 447 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 448}
421 449
422sub focus_in { 450sub invoke_focus_in {
423 my ($self) = @_; 451 my ($self) = @_;
424 452
425 return if $FOCUS == $self; 453 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 454 return unless $self->{can_focus};
427 455
428 my $focus = $FOCUS; $FOCUS = $self; 456 $FOCUS = $self;
429 457
430 $self->_emit (focus_in => $focus); 458 $self->update;
431 459
432 $focus->update if $focus; 460 0
433 $FOCUS->update;
434} 461}
435 462
436sub focus_out { 463sub invoke_focus_out {
437 my ($self) = @_; 464 my ($self) = @_;
438 465
439 return unless $FOCUS == $self; 466 return unless $FOCUS == $self;
440 467
441 my $focus = $FOCUS; undef $FOCUS; 468 undef $FOCUS;
442 469
443 $self->_emit (focus_out => $focus); 470 $self->update;
444 471
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 472 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 473 unless $FOCUS;
449}
450 474
475 0
476}
477
478sub grab_focus {
479 my ($self) = @_;
480
481 $FOCUS->emit ("focus_out") if $FOCUS;
482 $self->emit ("focus_in");
483}
484
451sub mouse_motion { 0 } 485sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 486sub invoke_button_up { 0 }
453sub key_down { 0 } 487sub invoke_key_down { 0 }
454sub key_up { 0 } 488sub invoke_key_up { 0 }
489sub invoke_mouse_wheel { 0 }
455 490
456sub button_down { 491sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 492 my ($self, $ev, $x, $y) = @_;
458 493
459 $self->focus_in; 494 $self->grab_focus;
460 495
461 0 496 0
497}
498
499sub connect {
500 my ($self, $signal, $cb) = @_;
501
502 push @{ $self->{signal_cb}{$signal} }, $cb;
503
504 defined wantarray and CFPlus::guard {
505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
506 @{ $self->{signal_cb}{$signal} };
507 }
508}
509
510sub disconnect_all {
511 my ($self, $signal) = @_;
512
513 delete $self->{signal_cb}{$signal};
514}
515
516my %has_coords = (
517 button_down => 1,
518 button_up => 1,
519 mouse_motion => 1,
520 mouse_wheel => 1,
521);
522
523sub emit {
524 my ($self, $signal, @args) = @_;
525
526 # I do not really like this solution, but I do not like duplication
527 # and needlessly verbose code, either.
528 my @append
529 = $has_coords{$signal}
530 ? $args[0]->xy ($self)
531 : ();
532
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534
535 #d##TODO# stop propagating at first true, do not use sum
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 539}
463 540
464sub find_widget { 541sub find_widget {
465 my ($self, $x, $y) = @_; 542 my ($self, $x, $y) = @_;
466 543
… …
476sub set_parent { 553sub set_parent {
477 my ($self, $parent) = @_; 554 my ($self, $parent) = @_;
478 555
479 Scalar::Util::weaken ($self->{parent} = $parent); 556 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 557 $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} 558}
505 559
506sub realloc { 560sub realloc {
507 my ($self) = @_; 561 my ($self) = @_;
508 562
… …
541 return unless $self->{h} && $self->{w}; 595 return unless $self->{h} && $self->{w};
542 596
543 # update screen rectangle 597 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 598 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 599 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 600
549 # skip widgets that are entirely outside the drawing area 601 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 602 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 603 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 604
… …
575 glVertex $self->{w} - 1, 0; 627 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 628 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 629 glVertex 0 , $self->{h} - 1;
578 glEnd; 630 glEnd;
579 glPopMatrix; 631 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 633 }
582 634
583 $self->_draw; 635 $self->_draw;
584 glPopMatrix; 636 glPopMatrix;
585} 637}
… …
591} 643}
592 644
593sub DESTROY { 645sub DESTROY {
594 my ($self) = @_; 646 my ($self) = @_;
595 647
648 return if CFPlus::in_destruct;
649
650 eval { $self->destroy };
651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652
596 delete $WIDGET{$self+0}; 653 delete $WIDGET{$self+0};
597 #$self->deactivate;
598} 654}
599 655
600############################################################################# 656#############################################################################
601 657
602package CFClient::UI::DrawBG; 658package CFPlus::UI::DrawBG;
603 659
604our @ISA = CFClient::UI::Base::; 660our @ISA = CFPlus::UI::Base::;
605 661
606use strict; 662use strict;
607use CFClient::OpenGL; 663use CFPlus::OpenGL;
608 664
609sub new { 665sub new {
610 my $class = shift; 666 my $class = shift;
611 667
612 # range [value, low, high, page] 668 # range [value, low, high, page]
… …
643 } 699 }
644} 700}
645 701
646############################################################################# 702#############################################################################
647 703
648package CFClient::UI::Empty; 704package CFPlus::UI::Empty;
649 705
650our @ISA = CFClient::UI::Base::; 706our @ISA = CFPlus::UI::Base::;
651 707
652sub new { 708sub new {
653 my ($class, %arg) = @_; 709 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 710 $class->SUPER::new (can_events => 0, %arg);
655} 711}
… …
662 718
663sub draw { } 719sub draw { }
664 720
665############################################################################# 721#############################################################################
666 722
667package CFClient::UI::Container; 723package CFPlus::UI::Container;
668 724
669our @ISA = CFClient::UI::Base::; 725our @ISA = CFPlus::UI::Base::;
670 726
671sub new { 727sub new {
672 my ($class, %arg) = @_; 728 my ($class, %arg) = @_;
673 729
674 my $children = delete $arg{children}; 730 my $children = delete $arg{children};
… …
683 if $children; 739 if $children;
684 740
685 $self 741 $self
686} 742}
687 743
744sub realloc {
745 my ($self) = @_;
746
747 $self->{force_realloc} = 1;
748 $self->{force_size_alloc} = 1;
749 $self->SUPER::realloc;
750}
751
688sub add { 752sub add {
689 my ($self, @widgets) = @_; 753 my ($self, @widgets) = @_;
690 754
691 $_->set_parent ($self) 755 $_->set_parent ($self)
692 for @widgets; 756 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 816 $_->draw for @{$self->{children}};
753} 817}
754 818
755############################################################################# 819#############################################################################
756 820
757package CFClient::UI::Bin; 821package CFPlus::UI::Bin;
758 822
759our @ISA = CFClient::UI::Container::; 823our @ISA = CFPlus::UI::Container::;
760 824
761sub new { 825sub new {
762 my ($class, %arg) = @_; 826 my ($class, %arg) = @_;
763 827
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 828 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 829
766 $class->SUPER::new (children => [$child], %arg) 830 $class->SUPER::new (children => [$child], %arg)
767} 831}
768 832
769sub add { 833sub add {
770 my ($self, $child) = @_; 834 my ($self, $child) = @_;
771 835
772 $self->{children} = []; 836 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 837 $self->SUPER::add ($child);
775} 838}
776 839
777sub remove { 840sub remove {
778 my ($self, $widget) = @_; 841 my ($self, $widget) = @_;
779 842
780 $self->SUPER::remove ($widget); 843 $self->SUPER::remove ($widget);
781 844
782 $self->{children} = [new CFClient::UI::Empty] 845 $self->{children} = [new CFPlus::UI::Empty]
783 unless @{$self->{children}}; 846 unless @{$self->{children}};
784} 847}
785 848
786sub child { $_[0]->{children}[0] } 849sub child { $_[0]->{children}[0] }
787 850
788sub size_request { 851sub size_request {
789 $_[0]{children}[0]->size_request 852 $_[0]{children}[0]->size_request
790} 853}
791 854
792sub size_allocate { 855sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 856 my ($self, $w, $h) = @_;
794 857
795 $self->{children}[0]->configure (0, 0, $w, $h); 858 $self->{children}[0]->configure (0, 0, $w, $h);
859
860 1
796} 861}
797 862
798############################################################################# 863#############################################################################
799 864
800# back-buffered drawing area 865# back-buffered drawing area
801 866
802package CFClient::UI::Window; 867package CFPlus::UI::Window;
803 868
804our @ISA = CFClient::UI::Bin::; 869our @ISA = CFPlus::UI::Bin::;
805 870
806use CFClient::OpenGL; 871use CFPlus::OpenGL;
807 872
808sub new { 873sub new {
809 my ($class, %arg) = @_; 874 my ($class, %arg) = @_;
810 875
811 my $self = $class->SUPER::new (%arg); 876 my $self = $class->SUPER::new (%arg);
… …
816 881
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 882 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 883 $self->SUPER::update;
819} 884}
820 885
821sub size_allocate { 886sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
823 888
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 889 $self->update;
890
891 $self->SUPER::invoke_size_allocate ($w, $h)
826} 892}
827 893
828sub _render { 894sub _render {
829 my ($self) = @_; 895 my ($self) = @_;
830 896
… …
832} 898}
833 899
834sub render_child { 900sub render_child {
835 my ($self) = @_; 901 my ($self) = @_;
836 902
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 903 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 904 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 905 glClear GL_COLOR_BUFFER_BIT;
840 906
841 { 907 {
842 package CFClient::UI::Base; 908 package CFPlus::UI::Base;
843 909
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 910 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 911 (0, 0, $self->{w}, $self->{h});
912
913 $self->_render;
846 } 914 }
847
848 $self->_render;
849 }; 915 };
850} 916}
851 917
852sub _draw { 918sub _draw {
853 my ($self) = @_; 919 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 920
857 my $tex = $self->{texture} 921 my $tex = $self->{texture}
858 or return; 922 or return;
859 923
860 glEnable GL_TEXTURE_2D; 924 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 926 glColor 0, 0, 0, 1;
863 927
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 928 $tex->draw_quad_alpha_premultiplied (0, 0);
865 929
866 glDisable GL_TEXTURE_2D; 930 glDisable GL_TEXTURE_2D;
867} 931}
868 932
869############################################################################# 933#############################################################################
870 934
871package CFClient::UI::ViewPort; 935package CFPlus::UI::ViewPort;
872 936
873our @ISA = CFClient::UI::Window::; 937our @ISA = CFPlus::UI::Window::;
874 938
875sub new { 939sub new {
876 my $class = shift; 940 my $class = shift;
877 941
878 $class->SUPER::new ( 942 $class->SUPER::new (
… …
891 $h = 10 if $self->{scroll_y}; 955 $h = 10 if $self->{scroll_y};
892 956
893 ($w, $h) 957 ($w, $h)
894} 958}
895 959
896sub size_allocate { 960sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 961 my ($self, $w, $h) = @_;
898 962
899 my $child = $self->child; 963 my $child = $self->child;
900 964
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 965 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 966 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 967
904 $self->child->configure (0, 0, $w, $h); 968 $self->child->configure (0, 0, $w, $h);
905 $self->update; 969 $self->update;
970
971 1
906} 972}
907 973
908sub set_offset { 974sub set_offset {
909 my ($self, $x, $y) = @_; 975 my ($self, $x, $y) = @_;
910 976
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1004 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1006 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1007 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1008 }
943} 1009}
944 1010
945sub _render { 1011sub _render {
946 my ($self) = @_; 1012 my ($self) = @_;
947 1013
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1014 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}; 1015 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1016
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1017 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1018
953 $self->SUPER::_render; 1019 $self->SUPER::_render;
954} 1020}
955 1021
956############################################################################# 1022#############################################################################
957 1023
958package CFClient::UI::ScrolledWindow; 1024package CFPlus::UI::ScrolledWindow;
959 1025
960our @ISA = CFClient::UI::HBox::; 1026our @ISA = CFPlus::UI::HBox::;
961 1027
962sub new { 1028sub new {
963 my ($class, %arg) = @_; 1029 my ($class, %arg) = @_;
964 1030
965 my $child = delete $arg{child}; 1031 my $child = delete $arg{child};
966 1032
967 my $self; 1033 my $self;
968 1034
969 my $slider = new CFClient::UI::Slider 1035 my $slider = new CFPlus::UI::Slider
970 vertical => 1, 1036 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1037 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1038 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1039 $self->{vp}->set_offset (0, $_[1]);
974 }, 1040 },
975 ; 1041 ;
976 1042
977 $self = $class->SUPER::new ( 1043 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1044 vp => (new CFPlus::UI::ViewPort expand => 1),
1045 can_events => 1,
979 slider => $slider, 1046 slider => $slider,
980 %arg, 1047 %arg,
981 ); 1048 );
982 1049
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1050 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1051 $self->add ($child) if $child;
985 1052
986 $self 1053 $self
987} 1054}
988 1055
1056#TODO# update range on size_allocate depending on child
1057
989sub add { 1058sub add {
990 my ($self, $widget) = @_; 1059 my ($self, $widget) = @_;
991 1060
992 $self->{vp}->add ($self->{child} = $widget); 1061 $self->{vp}->add ($self->{child} = $widget);
993} 1062}
994 1063
1064sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_;
1066
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev);
1070
1071 1
1072}
1073
1074sub update_slider {
1075 my ($self) = @_;
1076
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1078}
1079
995sub update { 1080sub update {
996 my ($self) = @_; 1081 my ($self) = @_;
997 1082
998 $self->SUPER::update; 1083 $self->SUPER::update;
999 1084
1000 # todo: overwrite size_allocate of child 1085 $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} 1086}
1004 1087
1005sub size_allocate { 1088sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1089 my ($self, $w, $h) = @_;
1007 1090
1091 $self->update_slider;
1092
1008 $self->SUPER::size_allocate ($w, $h); 1093 $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} 1094}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1095
1017############################################################################# 1096#############################################################################
1018 1097
1019package CFClient::UI::Frame; 1098package CFPlus::UI::Frame;
1020 1099
1021our @ISA = CFClient::UI::Bin::; 1100our @ISA = CFPlus::UI::Bin::;
1022 1101
1023use CFClient::OpenGL; 1102use CFPlus::OpenGL;
1024 1103
1025sub new { 1104sub new {
1026 my $class = shift; 1105 my $class = shift;
1027 1106
1028 $class->SUPER::new ( 1107 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1133 $self->SUPER::_draw;
1055} 1134}
1056 1135
1057############################################################################# 1136#############################################################################
1058 1137
1059package CFClient::UI::FancyFrame; 1138package CFPlus::UI::FancyFrame;
1060 1139
1061our @ISA = CFClient::UI::Bin::; 1140our @ISA = CFPlus::UI::Bin::;
1062 1141
1063use CFClient::OpenGL; 1142use CFPlus::OpenGL;
1064
1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1143
1073sub new { 1144sub new {
1074 my ($class, %arg) = @_; 1145 my ($class, %arg) = @_;
1075 1146
1076 my $title = delete $arg{title}; 1147 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label
1149 align => 1,
1150 valign => 0,
1151 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75;
1153 }
1154
1155 my $self = $class->SUPER::new (
1156 # label => "",
1157 fg => [0.6, 0.3, 0.1],
1158 border => 0.8,
1159 style => 'single',
1160 %arg,
1161 );
1162
1163 $self
1164}
1165
1166sub add {
1167 my ($self, @widgets) = @_;
1168
1169 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1171}
1172
1173sub border {
1174 int $_[0]{border} * $::FONTSIZE
1175}
1176
1177sub size_request {
1178 my ($self) = @_;
1179
1180 ($self->{label_w}, undef) = $self->{label}->size_request
1181 if $self->{label};
1182
1183 my ($w, $h) = $self->SUPER::size_request;
1184
1185 (
1186 $w + $self->border * 2,
1187 $h + $self->border * 2,
1188 )
1189}
1190
1191sub invoke_size_allocate {
1192 my ($self, $w, $h) = @_;
1193
1194 my $border = $self->border;
1195
1196 $w -= List::Util::max 0, $border * 2;
1197 $h -= List::Util::max 0, $border * 2;
1198
1199 if (my $label = $self->{label}) {
1200 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1201 $label->{h} = List::Util::min $h, $border;
1202 $label->invoke_size_allocate ($label->{w}, $label->{h});
1203 }
1204
1205 $self->child->configure ($border, $border, $w, $h);
1206
1207 1
1208}
1209
1210sub _draw {
1211 my ($self) = @_;
1212
1213 my $child = $self->{children}[0];
1214
1215 my $border = $self->border;
1216 my ($w, $h) = ($self->{w}, $self->{h});
1217
1218 $child->draw;
1219
1220 glColor @{$self->{fg}};
1221 glBegin GL_LINE_STRIP;
1222 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1223 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1224 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1225 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1226 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1227 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1228 glEnd;
1229
1230 if ($self->{label}) {
1231 glTranslate $border * 2, 0;
1232 $self->{label}->_draw;
1233 }
1234}
1235
1236#############################################################################
1237
1238package CFPlus::UI::Toplevel;
1239
1240our @ISA = CFPlus::UI::Bin::;
1241
1242use CFPlus::OpenGL;
1243
1244my $bg =
1245 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1246 mipmap => 1, wrap => 1;
1247
1248my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1251
1252sub new {
1253 my ($class, %arg) = @_;
1077 1254
1078 my $self = $class->SUPER::new ( 1255 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1256 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1257 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1258 border => 0.6,
1082 can_events => 1, 1259 can_events => 1,
1083 min_w => 16, 1260 min_w => 64,
1084 min_h => 16, 1261 min_h => 32,
1085 %arg, 1262 %arg,
1086 ); 1263 );
1087 1264
1088 $self->{title} = new CFClient::UI::Label 1265 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1266 align => 0,
1090 valign => 1, 1267 valign => 1,
1091 text => $title, 1268 text => $self->{title},
1092 fontsize => $self->{border} 1269 fontsize => $self->{border},
1093 if defined $title; 1270 if exists $self->{title};
1271
1272 if ($self->{has_close_button}) {
1273 $self->{close_button} =
1274 new CFPlus::UI::ImageButton
1275 path => 'x1_close.png',
1276 on_activate => sub { $self->emit ("delete") };
1277
1278 $self->CFPlus::UI::Container::add ($self->{close_button});
1279 }
1094 1280
1095 $self 1281 $self
1096} 1282}
1097 1283
1098sub add { 1284sub add {
1099 my ($self, @widgets) = @_; 1285 my ($self, @widgets) = @_;
1100 1286
1101 $self->SUPER::add (@widgets); 1287 $self->SUPER::add (@widgets);
1288 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1289 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1290}
1104 1291
1105sub border { 1292sub border {
1106 int $_[0]{border} * $::FONTSIZE 1293 int $_[0]{border} * $::FONTSIZE
1107} 1294}
1108 1295
1109sub size_request { 1296sub size_request {
1110 my ($self) = @_; 1297 my ($self) = @_;
1111 1298
1112 $self->{title}->size_request 1299 $self->{title_widget}->size_request
1113 if $self->{title}; 1300 if $self->{title_widget};
1301
1302 $self->{close_button}->size_request
1303 if $self->{close_button};
1114 1304
1115 my ($w, $h) = $self->SUPER::size_request; 1305 my ($w, $h) = $self->SUPER::size_request;
1116 1306
1117 ( 1307 (
1118 $w + $self->border * 2, 1308 $w + $self->border * 2,
1119 $h + $self->border * 2, 1309 $h + $self->border * 2,
1120 ) 1310 )
1121} 1311}
1122 1312
1123sub size_allocate { 1313sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1314 my ($self, $w, $h) = @_;
1125 1315
1126 if ($self->{title}) { 1316 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1317 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1318 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1319 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1320 }
1131 1321
1132 my $border = $self->border; 1322 my $border = $self->border;
1133 1323
1134 $h -= List::Util::max 0, $border * 2; 1324 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1325 $w -= List::Util::max 0, $border * 2;
1326
1327 $self->child->configure ($border, $border, $w, $h);
1328
1329 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1330 if $self->{close_button};
1331
1332 1
1333}
1334
1335sub invoke_delete {
1336 my ($self) = @_;
1337
1338 $self->hide;
1136 1339
1137 $self->child->configure ($border, $border, $w, $h); 1340 1
1138} 1341}
1139 1342
1140sub button_down { 1343sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1344 my ($self, $ev, $x, $y) = @_;
1142 1345
1143 my ($w, $h) = @$self{qw(w h)}; 1346 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1347 my $border = $self->border;
1145 1348
… …
1176 1379
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1380 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1381
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1382 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1383 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1384 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1385 };
1183 } else { 1386 } else {
1184 return 0; 1387 return 0;
1185 } 1388 }
1186 1389
1187 1 1390 1
1188} 1391}
1189 1392
1190sub button_up { 1393sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1394 my ($self, $ev, $x, $y) = @_;
1192 1395
1193 !!delete $self->{motion} 1396 ! ! delete $self->{motion}
1194} 1397}
1195 1398
1196sub mouse_motion { 1399sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1198 1401
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1402 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1403
1201 !!$self->{motion} 1404 ! ! $self->{motion}
1405}
1406
1407sub invoke_visibility_change {
1408 my ($self, $visible) = @_;
1409
1410 delete $self->{motion} unless $visible;
1411
1412 0
1202} 1413}
1203 1414
1204sub _draw { 1415sub _draw {
1205 my ($self) = @_; 1416 my ($self) = @_;
1206 1417
… …
1232 1443
1233 glDisable GL_TEXTURE_2D; 1444 glDisable GL_TEXTURE_2D;
1234 1445
1235 $child->draw; 1446 $child->draw;
1236 1447
1237 if ($self->{title}) { 1448 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1449 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1450 $self->{title_widget}->_draw;
1451
1452 glTranslate 0, - ($border - $self->{h});
1240 } 1453 }
1454
1455 $self->{close_button}->draw
1456 if $self->{close_button};
1241} 1457}
1242 1458
1243############################################################################# 1459#############################################################################
1244 1460
1245package CFClient::UI::Table; 1461package CFPlus::UI::Table;
1246 1462
1247our @ISA = CFClient::UI::Base::; 1463our @ISA = CFPlus::UI::Base::;
1248 1464
1249use List::Util qw(max sum); 1465use List::Util qw(max sum);
1250 1466
1251use CFClient::OpenGL; 1467use CFPlus::OpenGL;
1252 1468
1253sub new { 1469sub new {
1254 my $class = shift; 1470 my $class = shift;
1255 1471
1256 $class->SUPER::new ( 1472 $class->SUPER::new (
… …
1262sub children { 1478sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1480}
1265 1481
1266sub add { 1482sub add {
1267 my ($self, $x, $y, $child) = @_; 1483 my ($self) = shift;
1268 1484
1485 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1487 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1488 $self->{children}[$y][$x] = $child;
1489 }
1271 1490
1491 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1493 $self->realloc;
1494}
1495
1496sub remove {
1497 my ($self, $child) = @_;
1498
1499 # TODO: not yet implemented
1273} 1500}
1274 1501
1275# TODO: move to container class maybe? send children a signal on removal? 1502# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1503sub clear {
1277 my ($self) = @_; 1504 my ($self) = @_;
… …
1318 (sum @$ws), 1545 (sum @$ws),
1319 (sum @$hs), 1546 (sum @$hs),
1320 ) 1547 )
1321} 1548}
1322 1549
1323sub size_allocate { 1550sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1551 my ($self, $w, $h) = @_;
1325 1552
1326 my ($ws, $hs) = $self->get_wh; 1553 my ($ws, $hs) = $self->get_wh;
1327 1554
1328 my $req_w = (sum @$ws) || 1; 1555 my $req_w = (sum @$ws) || 1;
… …
1335 1562
1336 # linearly scale sizes 1563 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1566
1340 CFClient::UI::harmonize $ws; 1567 CFPlus::UI::harmonize $ws;
1341 CFClient::UI::harmonize $hs; 1568 CFPlus::UI::harmonize $hs;
1342 1569
1343 my $y; 1570 my $y;
1344 1571
1345 for my $r (0 .. $#{$self->{children}}) { 1572 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1573 my $row = $self->{children}[$r]
… …
1360 } 1587 }
1361 1588
1362 $y += $row_h; 1589 $y += $row_h;
1363 } 1590 }
1364 1591
1592 1
1365} 1593}
1366 1594
1367sub find_widget { 1595sub find_widget {
1368 my ($self, $x, $y) = @_; 1596 my ($self, $x, $y) = @_;
1369 1597
… …
1388 } 1616 }
1389} 1617}
1390 1618
1391############################################################################# 1619#############################################################################
1392 1620
1393package CFClient::UI::Box; 1621package CFPlus::UI::Box;
1394 1622
1395our @ISA = CFClient::UI::Container::; 1623our @ISA = CFPlus::UI::Container::;
1396 1624
1397sub size_request { 1625sub size_request {
1398 my ($self) = @_; 1626 my ($self) = @_;
1399 1627
1400 $self->{vertical} 1628 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1634 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1635 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1636 )
1409} 1637}
1410 1638
1411sub size_allocate { 1639sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1640 my ($self, $w, $h) = @_;
1413 1641
1414 my $space = $self->{vertical} ? $h : $w; 1642 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1643 my @children = $self->visible_children;
1416 1644
1417 my @req; 1645 my @req;
1418 1646
1419 if ($self->{homogeneous}) { 1647 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1648 @req = ($space / (@children || 1)) x @children;
1421 } else { 1649 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1650 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1651 my $req = List::Util::sum @req;
1424 1652
1425 if ($req > $space) { 1653 if ($req > $space) {
1426 # ah well, not enough space 1654 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1655 $_ *= $space / $req for @req;
1428 } else { 1656 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1657 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1658
1431 $space = ($space - $req) / $expand; # remaining space to give away 1659 $space = ($space - $req) / $expand; # remaining space to give away
1432 1660
1433 $req[$_] += $space * $children->[$_]{expand} 1661 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1662 for 0 .. $#children;
1435 } 1663 }
1436 } 1664 }
1437 1665
1438 CFClient::UI::harmonize \@req; 1666 CFPlus::UI::harmonize \@req;
1439 1667
1440 my $pos = 0; 1668 my $pos = 0;
1441 for (0 .. $#$children) { 1669 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1670 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1671 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1672
1445 $pos += $alloc; 1673 $pos += $alloc;
1446 } 1674 }
1447 1675
1448 1 1676 1
1449} 1677}
1450 1678
1451############################################################################# 1679#############################################################################
1452 1680
1453package CFClient::UI::HBox; 1681package CFPlus::UI::HBox;
1454 1682
1455our @ISA = CFClient::UI::Box::; 1683our @ISA = CFPlus::UI::Box::;
1456 1684
1457sub new { 1685sub new {
1458 my $class = shift; 1686 my $class = shift;
1459 1687
1460 $class->SUPER::new ( 1688 $class->SUPER::new (
… …
1463 ) 1691 )
1464} 1692}
1465 1693
1466############################################################################# 1694#############################################################################
1467 1695
1468package CFClient::UI::VBox; 1696package CFPlus::UI::VBox;
1469 1697
1470our @ISA = CFClient::UI::Box::; 1698our @ISA = CFPlus::UI::Box::;
1471 1699
1472sub new { 1700sub new {
1473 my $class = shift; 1701 my $class = shift;
1474 1702
1475 $class->SUPER::new ( 1703 $class->SUPER::new (
… …
1478 ) 1706 )
1479} 1707}
1480 1708
1481############################################################################# 1709#############################################################################
1482 1710
1483package CFClient::UI::Label; 1711package CFPlus::UI::Label;
1484 1712
1485our @ISA = CFClient::UI::DrawBG::; 1713our @ISA = CFPlus::UI::DrawBG::;
1486 1714
1487use CFClient::OpenGL; 1715use CFPlus::OpenGL;
1488 1716
1489sub new { 1717sub new {
1490 my ($class, %arg) = @_; 1718 my ($class, %arg) = @_;
1491 1719
1492 my $self = $class->SUPER::new ( 1720 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1723 #active_bg => none
1496 #font => default_font 1724 #font => default_font
1497 #text => initial text 1725 #text => initial text
1498 #markup => initial narkup 1726 #markup => initial narkup
1499 #max_w => maximum pixel width 1727 #max_w => maximum pixel width
1728 #style => 0, # render flags
1500 ellipsise => 3, # end 1729 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1730 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1731 fontsize => 1,
1503 align => -1, 1732 align => -1,
1504 valign => -1, 1733 valign => -1,
1505 padding_x => 2, 1734 padding_x => 2,
1506 padding_y => 2, 1735 padding_y => 2,
1507 can_events => 0, 1736 can_events => 0,
1508 %arg 1737 %arg
1509 ); 1738 );
1510 1739
1511 if (exists $self->{template}) { 1740 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1741 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1742 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1743 $self->{template} = $layout;
1515 } 1744 }
1516 1745
1517 if (exists $self->{markup}) { 1746 if (exists $self->{markup}) {
… …
1521 } 1750 }
1522 1751
1523 $self 1752 $self
1524} 1753}
1525 1754
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1755sub update {
1537 my ($self) = @_; 1756 my ($self) = @_;
1538 1757
1539 delete $self->{texture}; 1758 delete $self->{texture};
1540 $self->SUPER::update; 1759 $self->SUPER::update;
… …
1551 my ($self, $text) = @_; 1770 my ($self, $text) = @_;
1552 1771
1553 return if $self->{text} eq "T$text"; 1772 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1773 $self->{text} = "T$text";
1555 1774
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1775 $self->{layout}->set_text ($text);
1776
1558 delete $self->{req_h}; 1777 delete $self->{size_req};
1559
1560 $self->realloc; 1778 $self->realloc;
1561 $self->update; 1779 $self->update;
1562} 1780}
1563 1781
1564sub set_markup { 1782sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1785 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1786 $self->{text} = "M$markup";
1569 1787
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1788 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1789
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1790 $self->{layout}->set_markup ($markup);
1791
1574 delete $self->{req_h}; 1792 delete $self->{size_req};
1575
1576 $self->realloc; 1793 $self->realloc;
1577 $self->update; 1794 $self->update;
1578} 1795}
1579 1796
1580sub size_request { 1797sub size_request {
1581 my ($self) = @_; 1798 my ($self) = @_;
1582 1799
1583 if (exists $self->{req_h}) { 1800 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1801 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1802 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1803 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1804 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1806
1592 my ($w, $h) = $self->{layout}->size; 1807 my ($w, $h) = $self->{layout}->size;
1593 1808
1594 if (exists $self->{template}) { 1809 if (exists $self->{template}) {
1595 $self->{template}->set_font ($self->{font}) if $self->{font}; 1810 $self->{template}->set_font ($self->{font}) if $self->{font};
1811 $self->{template}->set_width ($self->{max_w} || -1);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1812 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1813
1598 my ($w2, $h2) = $self->{template}->size; 1814 my ($w2, $h2) = $self->{template}->size;
1599 1815
1600 $w = List::Util::max $w, $w2; 1816 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1817 $h = List::Util::max $h, $h2;
1602 } 1818 }
1603 1819
1604 ($w, $h) 1820 [$w, $h]
1605 } 1821 };
1606}
1607 1822
1823 @{ $self->{size_req} }
1824}
1825
1826sub baseline_shift {
1827 $_[0]{layout}->descent
1828}
1829
1608sub size_allocate { 1830sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1831 my ($self, $w, $h) = @_;
1610 1832
1611 delete $self->{ox}; 1833 delete $self->{ox};
1612 1834
1613 delete $self->{texture} 1835 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1836 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1837
1838 1
1615} 1839}
1616 1840
1617sub set_fontsize { 1841sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1842 my ($self, $fontsize) = @_;
1619 1843
1620 $self->{fontsize} = $fontsize; 1844 $self->{fontsize} = $fontsize;
1845 delete $self->{size_req};
1621 delete $self->{texture}; 1846 delete $self->{texture};
1622 1847
1623 $self->realloc; 1848 $self->realloc;
1624} 1849}
1625 1850
1851sub reconfigure {
1852 my ($self) = @_;
1853
1854 delete $self->{size_req};
1855 delete $self->{texture};
1856
1857 $self->SUPER::reconfigure;
1858}
1859
1626sub _draw { 1860sub _draw {
1627 my ($self) = @_; 1861 my ($self) = @_;
1628 1862
1629 $self->SUPER::_draw; # draw background, if applicable 1863 $self->SUPER::_draw; # draw background, if applicable
1630 1864
1631 my $tex = $self->{texture} ||= do { 1865 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 1866 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1867 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 1868 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1869 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1870 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 1872
1639 new_from_layout CFClient::Texture $self->{layout} 1873 [$self->{layout}->size]
1640 }; 1874 };
1641 1875
1642 unless (exists $self->{ox}) { 1876 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1877 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1878 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 1879 : ($self->{w} - $size->[0]) * 0.5);
1646 1880
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1883 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 1884 };
1651 1885
1652 glEnable GL_TEXTURE_2D; 1886 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1887 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1888
1655 glColor_premultiply @{$self->{fg}} 1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 1890}
1662 1891
1663############################################################################# 1892#############################################################################
1664 1893
1665package CFClient::UI::EntryBase; 1894package CFPlus::UI::EntryBase;
1666 1895
1667our @ISA = CFClient::UI::Label::; 1896our @ISA = CFPlus::UI::Label::;
1668 1897
1669use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1670 1899
1671sub new { 1900sub new {
1672 my $class = shift; 1901 my $class = shift;
1673 1902
1674 $class->SUPER::new ( 1903 $class->SUPER::new (
… …
1678 active_fg => [0, 0, 0], 1907 active_fg => [0, 0, 0],
1679 can_hover => 1, 1908 can_hover => 1,
1680 can_focus => 1, 1909 can_focus => 1,
1681 valign => 0, 1910 valign => 0,
1682 can_events => 1, 1911 can_events => 1,
1912 ellipsise => 0,
1683 #text => ... 1913 #text => ...
1914 #hidden => "*",
1684 @_ 1915 @_
1685 ) 1916 )
1686} 1917}
1687 1918
1688sub _set_text { 1919sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1926 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1927 $self->{text} = $text;
1697 1928
1698 $text =~ s/./*/g if $self->{hidden}; 1929 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1930 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1931 delete $self->{size_req};
1701 1932
1702 $self->_emit (changed => $self->{text}); 1933 $self->emit (changed => $self->{text});
1703 1934
1704 $self->realloc; 1935 $self->realloc;
1705 $self->update; 1936 $self->update;
1706} 1937}
1707 1938
… …
1722 my ($w, $h) = $self->SUPER::size_request; 1953 my ($w, $h) = $self->SUPER::size_request;
1723 1954
1724 ($w + 1, $h) # add 1 for cursor 1955 ($w + 1, $h) # add 1 for cursor
1725} 1956}
1726 1957
1727sub key_down { 1958sub invoke_key_down {
1728 my ($self, $ev) = @_; 1959 my ($self, $ev) = @_;
1729 1960
1730 my $mod = $ev->{mod}; 1961 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1963 my $uni = $ev->{unicode};
… …
1735 1966
1736 if ($uni == 8) { 1967 if ($uni == 8) {
1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738 } elsif ($uni == 127) { 1969 } elsif ($uni == 127) {
1739 substr $text, $self->{cursor}, 1, ""; 1970 substr $text, $self->{cursor}, 1, "";
1740 } elsif ($sym == CFClient::SDLK_LEFT) { 1971 } elsif ($sym == CFPlus::SDLK_LEFT) {
1741 --$self->{cursor} if $self->{cursor}; 1972 --$self->{cursor} if $self->{cursor};
1742 } elsif ($sym == CFClient::SDLK_RIGHT) { 1973 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1743 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1974 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1975 } elsif ($sym == CFPlus::SDLK_HOME) {
1745 $self->{cursor} = 0; 1976 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1977 } elsif ($sym == CFPlus::SDLK_END) {
1747 $self->{cursor} = length $text; 1978 $self->{cursor} = length $text;
1979 } elsif ($uni == 21) { # ctrl-u
1980 $text = "";
1981 $self->{cursor} = 0;
1748 } elsif ($uni == 27) { 1982 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1983 $self->emit ('escape');
1750 } elsif ($uni) { 1984 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1985 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1986 } else {
1753 return 0; 1987 return 0;
1754 } 1988 }
1755 1989
1756 $self->_set_text ($text); 1990 $self->_set_text ($text);
1757 1991
1758 $self->realloc; 1992 $self->realloc;
1993 $self->update;
1759 1994
1760 1 1995 1
1761} 1996}
1762 1997
1763sub focus_in { 1998sub invoke_focus_in {
1764 my ($self) = @_; 1999 my ($self) = @_;
1765 2000
1766 $self->{last_activity} = $::NOW; 2001 $self->{last_activity} = $::NOW;
1767 2002
1768 $self->SUPER::focus_in; 2003 $self->SUPER::invoke_focus_in
1769} 2004}
1770 2005
1771sub button_down { 2006sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 2007 my ($self, $ev, $x, $y) = @_;
1773 2008
1774 $self->SUPER::button_down ($ev, $x, $y); 2009 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 2010
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 2011 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 2012
1778 # byte-index to char-index 2013 # byte-index to char-index
1779 my $text = $self->{text}; 2014 my $text = $self->{text};
1780 utf8::encode $text; 2015 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 2016 $self->{cursor} = length $text;
1782 2017
1783 $self->_set_text ($self->{text}); 2018 $self->_set_text ($self->{text});
1784 $self->update; 2019 $self->update;
1785 2020
1786 1 2021 1
1787} 2022}
1788 2023
1789sub mouse_motion { 2024sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 2025 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2026# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 2027
1793 0 2028 1
1794} 2029}
1795 2030
1796sub _draw { 2031sub _draw {
1797 my ($self) = @_; 2032 my ($self) = @_;
1798 2033
… …
1825 utf8::encode $text; 2060 utf8::encode $text;
1826 2061
1827 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2062 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1828 } 2063 }
1829 2064
1830 glColor @{$self->{fg}};
1831 glBegin GL_LINES; 2065 glBegin GL_LINES;
1832 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2066 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1834 glEnd; 2068 glEnd;
1835 } 2069 }
1836} 2070}
1837 2071
2072#############################################################################
2073
1838package CFClient::UI::Entry; 2074package CFPlus::UI::Entry;
1839 2075
1840our @ISA = CFClient::UI::EntryBase::; 2076our @ISA = CFPlus::UI::EntryBase::;
1841 2077
1842use CFClient::OpenGL; 2078use CFPlus::OpenGL;
1843 2079
1844sub key_down { 2080sub invoke_key_down {
1845 my ($self, $ev) = @_; 2081 my ($self, $ev) = @_;
1846 2082
1847 my $sym = $ev->{sym}; 2083 my $sym = $ev->{sym};
1848 2084
1849 if ($sym == 13) { 2085 if ($ev->{uni} == 0x0d || $sym == 13) {
1850 unshift @{$self->{history}}, 2086 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 2087 my $txt = $self->get_text;
2088
1852 $self->{history_pointer} = -1; 2089 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 2090 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 2091 $self->emit (activate => $txt);
1855 $self->update; 2092 $self->update;
1856 2093
1857 } elsif ($sym == CFClient::SDLK_UP) { 2094 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 2095 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 2096 $self->{history_saveback} = $self->get_text;
1860 } 2097 }
1861 if (@{$self->{history} || []} > 0) { 2098 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 2099 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 2101 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 2102 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2103 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 2104 }
1868 2105
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 2106 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 2107 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2108 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 2109
1873 if ($self->{history_pointer} >= 0) { 2110 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2111 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 2112 } else {
1876 $self->set_text ($self->{history_saveback}); 2113 $self->set_text ($self->{history_saveback});
1877 } 2114 }
1878 2115
1879 } else { 2116 } else {
1880 return $self->SUPER::key_down ($ev) 2117 return $self->SUPER::invoke_key_down ($ev)
1881 } 2118 }
1882 2119
1883 1 2120 1
1884} 2121}
1885 2122
1886############################################################################# 2123#############################################################################
1887 2124
2125package CFPlus::UI::TextEdit;
2126
2127our @ISA = CFPlus::UI::EntryBase::;
2128
2129use CFPlus::OpenGL;
2130
2131sub move_cursor_ver {
2132 my ($self, $dy) = @_;
2133
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2135
2136 $y += $dy;
2137
2138 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2139 $self->{cursor} = $index;
2140 delete $self->{cur_h};
2141 $self->update;
2142 return;
2143 }
2144}
2145
2146sub invoke_key_down {
2147 my ($self, $ev) = @_;
2148
2149 my $sym = $ev->{sym};
2150
2151 if ($sym == CFPlus::SDLK_UP) {
2152 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1);
2155 } else {
2156 return $self->SUPER::invoke_key_down ($ev)
2157 }
2158
2159 1
2160}
2161
2162#############################################################################
2163
1888package CFClient::UI::Button; 2164package CFPlus::UI::Button;
1889 2165
1890our @ISA = CFClient::UI::Label::; 2166our @ISA = CFPlus::UI::Label::;
1891 2167
1892use CFClient::OpenGL; 2168use CFPlus::OpenGL;
1893 2169
1894my @tex = 2170my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2172 qw(b1_button_active.png);
1897 2173
1898sub new { 2174sub new {
1899 my $class = shift; 2175 my $class = shift;
1900 2176
… …
1909 can_events => 1, 2185 can_events => 1,
1910 @_ 2186 @_
1911 ) 2187 )
1912} 2188}
1913 2189
1914sub activate { }
1915
1916sub button_up { 2190sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2191 my ($self, $ev, $x, $y) = @_;
1918 2192
1919 $self->emit ("activate") 2193 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2194 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2195 && $y >= 0 && $y < $self->{h};
… …
1939 $self->SUPER::_draw; 2213 $self->SUPER::_draw;
1940} 2214}
1941 2215
1942############################################################################# 2216#############################################################################
1943 2217
1944package CFClient::UI::CheckBox; 2218package CFPlus::UI::CheckBox;
1945 2219
1946our @ISA = CFClient::UI::DrawBG::; 2220our @ISA = CFPlus::UI::DrawBG::;
1947 2221
1948my @tex = 2222my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2224 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2225
1952use CFClient::OpenGL; 2226use CFPlus::OpenGL;
1953 2227
1954sub new { 2228sub new {
1955 my $class = shift; 2229 my $class = shift;
1956 2230
1957 $class->SUPER::new ( 2231 $class->SUPER::new (
… …
1971 my ($self) = @_; 2245 my ($self) = @_;
1972 2246
1973 (6) x 2 2247 (6) x 2
1974} 2248}
1975 2249
2250sub toggle {
2251 my ($self) = @_;
2252
2253 $self->{state} = !$self->{state};
2254 $self->emit (changed => $self->{state});
2255 $self->update;
2256}
2257
1976sub button_down { 2258sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2259 my ($self, $ev, $x, $y) = @_;
1978 2260
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2261 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2262 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2263 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2264 } else {
1984 return 0 2265 return 0
1985 } 2266 }
1986 2267
1987 1 2268 1
… …
2007 glDisable GL_TEXTURE_2D; 2288 glDisable GL_TEXTURE_2D;
2008} 2289}
2009 2290
2010############################################################################# 2291#############################################################################
2011 2292
2012package CFClient::UI::Image; 2293package CFPlus::UI::Image;
2013 2294
2014our @ISA = CFClient::UI::Base::; 2295our @ISA = CFPlus::UI::Base::;
2015 2296
2016use CFClient::OpenGL; 2297use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2298
2019our %loaded_images; 2299our %texture_cache;
2020 2300
2021sub new { 2301sub new {
2022 my $class = shift; 2302 my $class = shift;
2023 2303
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2304 my $self = $class->SUPER::new (
2305 can_events => 0,
2306 @_,
2307 );
2025 2308
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2309 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required";
2027 2311
2028 $loaded_images{$self->{image}} ||= 2312 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2030 2314
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2315 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2316
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2318
2037 $self 2319 $self
2038} 2320}
2039 2321
2322sub STORABLE_freeze {
2323 my ($self, $cloning) = @_;
2324
2325 $self->{path}
2326 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2327
2328 $self->{path}
2329}
2330
2331sub STORABLE_attach {
2332 my ($self, $cloning, $path) = @_;
2333
2334 $self->new (path => $path)
2335}
2336
2040sub size_request { 2337sub size_request {
2041 my ($self) = @_; 2338 my ($self) = @_;
2042 2339
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2340 ($self->{tex}{w}, $self->{tex}{h})
2044} 2341}
2045 2342
2046sub _draw { 2343sub _draw {
2047 my ($self) = @_; 2344 my ($self) = @_;
2048 2345
… …
2058 } 2355 }
2059 2356
2060 glEnable GL_TEXTURE_2D; 2357 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2359
2063 $tex->draw_quad_alpha (0, 0, $w, $h); 2360 $tex->draw_quad (0, 0, $w, $h);
2064 2361
2065 glDisable GL_TEXTURE_2D; 2362 glDisable GL_TEXTURE_2D;
2066} 2363}
2067 2364
2068############################################################################# 2365#############################################################################
2069 2366
2367package CFPlus::UI::ImageButton;
2368
2369our @ISA = CFPlus::UI::Image::;
2370
2371use CFPlus::OpenGL;
2372
2373my %textures;
2374
2375sub new {
2376 my $class = shift;
2377
2378 my $self = $class->SUPER::new (
2379 padding_x => 4,
2380 padding_y => 4,
2381 fg => [1, 1, 1],
2382 active_fg => [0, 0, 1],
2383 can_hover => 1,
2384 align => 0,
2385 valign => 0,
2386 can_events => 1,
2387 @_
2388 );
2389}
2390
2391sub invoke_button_up {
2392 my ($self, $ev, $x, $y) = @_;
2393
2394 $self->emit ("activate")
2395 if $x >= 0 && $x < $self->{w}
2396 && $y >= 0 && $y < $self->{h};
2397
2398 1
2399}
2400
2401#############################################################################
2402
2070package CFClient::UI::VGauge; 2403package CFPlus::UI::VGauge;
2071 2404
2072our @ISA = CFClient::UI::Base::; 2405our @ISA = CFPlus::UI::Base::;
2073 2406
2074use List::Util qw(min max); 2407use List::Util qw(min max);
2075 2408
2076use CFClient::OpenGL; 2409use CFPlus::OpenGL;
2077 2410
2078my %tex = ( 2411my %tex = (
2079 food => [ 2412 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2413 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2414 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2415 ],
2083 grace => [ 2416 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2417 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/ 2418 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2086 ], 2419 ],
2087 hp => [ 2420 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2422 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2423 ],
2091 mana => [ 2424 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2425 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/ 2426 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2094 ], 2427 ],
2095); 2428);
2096 2429
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2430# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2490 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2491 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2492
2160 my $h1 = $self->{h} * (1 - $ycut1); 2493 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2494 my $h2 = $self->{h} * (1 - $ycut2);
2495 my $h3 = $self->{h};
2496
2497 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2498
2163 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2500 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2501 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2502 glEnable GL_TEXTURE_2D;
… …
2185 2521
2186 if ($t3) { 2522 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2523 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2524 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2525 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2526 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2527 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2528 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2529 glEnd;
2194 } 2530 }
2195 2531
2196 glDisable GL_BLEND; 2532 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2198} 2534}
2199 2535
2200############################################################################# 2536#############################################################################
2201 2537
2202package CFClient::UI::Gauge; 2538package CFPlus::UI::Gauge;
2203 2539
2204our @ISA = CFClient::UI::VBox::; 2540our @ISA = CFPlus::UI::VBox::;
2205 2541
2206sub new { 2542sub new {
2207 my ($class, %arg) = @_; 2543 my ($class, %arg) = @_;
2208 2544
2209 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2547 can_hover => 1,
2212 can_events => 1, 2548 can_events => 1,
2213 %arg, 2549 %arg,
2214 ); 2550 );
2215 2551
2216 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2552 $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); 2553 $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"); 2554 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2219 2555
2220 $self 2556 $self
2221} 2557}
2222 2558
2223sub set_fontsize { 2559sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2580 $self->{value}->set_text ($val);
2245} 2581}
2246 2582
2247############################################################################# 2583#############################################################################
2248 2584
2249package CFClient::UI::Slider; 2585package CFPlus::UI::Slider;
2250 2586
2251use strict; 2587use strict;
2252 2588
2253use CFClient::OpenGL; 2589use CFPlus::OpenGL;
2254 2590
2255our @ISA = CFClient::UI::DrawBG::; 2591our @ISA = CFPlus::UI::DrawBG::;
2256 2592
2257my @tex = 2593my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2595 qw(s1_slider.png s1_slider_bg.png);
2260 2596
2261sub new { 2597sub new {
2262 my $class = shift; 2598 my $class = shift;
2263 2599
… …
2284 $self->update; 2620 $self->update;
2285 2621
2286 $self 2622 $self
2287} 2623}
2288 2624
2289sub changed { }
2290
2291sub set_range { 2625sub set_range {
2292 my ($self, $range) = @_; 2626 my ($self, $range) = @_;
2293 2627
2294 ($range, $self->{range}) = ($self->{range}, $range); 2628 ($range, $self->{range}) = ($self->{range}, $range);
2295 2629
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2630 if ("@$range" ne "@{$self->{range}}") {
2631 $self->update;
2632 $self->set_value ($self->{range}[0]);
2633 }
2298} 2634}
2299 2635
2300sub set_value { 2636sub set_value {
2301 my ($self, $value) = @_; 2637 my ($self, $value) = @_;
2302 2638
… …
2313 if $unit; 2649 if $unit;
2314 2650
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2651 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2652
2317 if ($value != $old_value) { 2653 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2654 $self->emit (changed => $value);
2319 $self->update; 2655 $self->update;
2320 } 2656 }
2321} 2657}
2322 2658
2323sub size_request { 2659sub size_request {
2324 my ($self) = @_; 2660 my ($self) = @_;
2325 2661
2326 ($self->{req_w}, $self->{req_h}) 2662 ($self->{req_w}, $self->{req_h})
2327} 2663}
2328 2664
2329sub button_down { 2665sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2666 my ($self, $ev, $x, $y) = @_;
2331 2667
2332 $self->SUPER::button_down ($ev, $x, $y); 2668 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2669
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2671
2336 $self->mouse_motion ($ev, $x, $y) 2672 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2673}
2338 2674
2339sub mouse_motion { 2675sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2676 my ($self, $ev, $x, $y) = @_;
2341 2677
2342 if ($GRAB == $self) { 2678 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2679 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2680
… …
2350 } else { 2686 } else {
2351 return 0; 2687 return 0;
2352 } 2688 }
2353 2689
2354 1 2690 1
2691}
2692
2693sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_;
2695
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2699
2700 ! ! $delta
2355} 2701}
2356 2702
2357sub update { 2703sub update {
2358 my ($self) = @_; 2704 my ($self) = @_;
2359 2705
… …
2408 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2409} 2755}
2410 2756
2411############################################################################# 2757#############################################################################
2412 2758
2413package CFClient::UI::ValSlider; 2759package CFPlus::UI::ValSlider;
2414 2760
2415our @ISA = CFClient::UI::HBox::; 2761our @ISA = CFPlus::UI::HBox::;
2416 2762
2417sub new { 2763sub new {
2418 my ($class, %arg) = @_; 2764 my ($class, %arg) = @_;
2419 2765
2420 my $range = delete $arg{range}; 2766 my $range = delete $arg{range};
2421 2767
2422 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2769 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2770 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 2771 to_value => sub { shift },
2426 from_value => sub { shift }, 2772 from_value => sub { shift },
2427 %arg, 2773 %arg,
2428 ); 2774 );
2429 2775
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2795sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2796sub set_value { shift->{slider}->set_value (@_) }
2451 2797
2452############################################################################# 2798#############################################################################
2453 2799
2454package CFClient::UI::TextView; 2800package CFPlus::UI::TextScroller;
2455 2801
2456our @ISA = CFClient::UI::HBox::; 2802our @ISA = CFPlus::UI::HBox::;
2457 2803
2458use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2459 2805
2460sub new { 2806sub new {
2461 my $class = shift; 2807 my $class = shift;
2462 2808
2463 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2464 fontsize => 1, 2810 fontsize => 1,
2465 can_events => 0, 2811 can_events => 1,
2812 indent => 0,
2466 #font => default_font 2813 #font => default_font
2467 @_, 2814 @_,
2468 2815
2469 layout => (new CFClient::Layout 1), 2816 layout => (new CFPlus::Layout),
2470 par => [], 2817 par => [],
2471 height => 0, 2818 height => 0,
2472 children => [ 2819 children => [
2473 (new CFClient::UI::Empty expand => 1), 2820 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 2821 (new CFPlus::UI::Slider vertical => 1),
2475 ], 2822 ],
2476 ); 2823 );
2477 2824
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 2825 $self->{children}[1]->connect (changed => sub { $self->update });
2479 2826
… …
2485 2832
2486 $self->{fontsize} = $fontsize; 2833 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2834 $self->reflow;
2488} 2835}
2489 2836
2837sub size_request {
2838 my ($self) = @_;
2839
2840 my ($empty, $slider) = @{ $self->{children} };
2841
2842 local $self->{children} = [$empty, $slider];
2843 $self->SUPER::size_request
2844}
2845
2490sub size_allocate { 2846sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2492 2848
2493 $self->SUPER::size_allocate ($w, $h); 2849 my ($empty, $slider, @other) = @{ $self->{children} };
2850 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2851
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2852 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2853 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2854 $self->{layout}->set_width ($empty->{w});
2855 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2856
2499 $self->reflow; 2857 $self->reflow;
2500}
2501 2858
2502sub text_size { 2859 local $self->{children} = [$empty, $slider];
2860 $self->SUPER::invoke_size_allocate ($w, $h)
2861}
2862
2863sub invoke_mouse_wheel {
2503 my ($self, $text, $indent) = @_; 2864 my ($self, $ev) = @_;
2865
2866 return 0 unless $ev->{dy}; # only vertical movements
2867
2868 $self->{children}[1]->emit (mouse_wheel => $ev);
2869
2870 1
2871}
2872
2873sub get_layout {
2874 my ($self, $para) = @_;
2504 2875
2505 my $layout = $self->{layout}; 2876 my $layout = $self->{layout};
2506 2877
2878 $layout->set_font ($self->{font}) if $self->{font};
2879 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2881 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2882 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2883 $layout->set_markup ($para->{markup});
2884
2885 $layout->set_shapes (
2886 map
2887 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2888 @{$para->{widget}}
2510 2889 );
2890
2511 $layout->size 2891 $layout
2512} 2892}
2513 2893
2514sub reflow { 2894sub reflow {
2515 my ($self) = @_; 2895 my ($self) = @_;
2516 2896
… …
2523 2903
2524 # todo: base offset on lines or so, not on pixels 2904 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset); 2905 $self->{children}[1]->set_value ($offset);
2526} 2906}
2527 2907
2908sub current_paragraph {
2909 my ($self) = @_;
2910
2911 $self->{top_paragraph} - 1
2912}
2913
2914sub scroll_to {
2915 my ($self, $para) = @_;
2916
2917 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2918
2919 $self->{scroll_to} = $para;
2920 $self->update;
2921}
2922
2528sub clear { 2923sub clear {
2529 my ($self) = @_; 2924 my ($self) = @_;
2925
2926 my (undef, undef, @other) = @{ $self->{children} };
2927 $self->remove ($_) for @other;
2530 2928
2531 $self->{par} = []; 2929 $self->{par} = [];
2532 $self->{height} = 0; 2930 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2931 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2932}
2535 2933
2536sub add_paragraph { 2934sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2935 my $self = shift;
2538 2936
2539 for my $line (split /\n/, $text) { 2937 for my $para (@_) {
2540 my ($w, $h) = $self->text_size ($line); 2938 $para = {
2939 fg => [1, 1, 1, 1],
2940 indent => 0,
2941 markup => "",
2942 widget => [],
2943 ref $para ? %$para : (markup => $para),
2944 w => 1e10,
2945 wrapped => 1,
2946 };
2947
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para;
2950 }
2951
2952 $self->{need_reflow}++;
2953 $self->update;
2954}
2955
2956sub scroll_to_bottom {
2957 my ($self) = @_;
2958
2959 $self->{scroll_to} = $#{$self->{par}};
2960 $self->update;
2961}
2962
2963sub force_uptodate {
2964 my ($self) = @_;
2965
2966 if (delete $self->{need_reflow}) {
2967 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2968
2969 my $height = 0;
2970
2971 for my $para (@{$self->{par}}) {
2972 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2973 my $layout = $self->get_layout ($para);
2974 my ($w, $h) = $layout->size;
2975
2976 $para->{w} = $w + $para->{indent};
2977 $para->{h} = $h;
2978 $para->{wrapped} = $layout->has_wrapped;
2979 }
2980
2981 $para->{y} = $height;
2982 $height += $para->{h};
2983 }
2984
2541 $self->{height} += $h; 2985 $self->{height} = $height;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2986 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2543 }
2544 2987
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2988 delete $self->{texture};
2989 }
2990
2991 if (my $paridx = delete $self->{scroll_to}) {
2992 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2993 }
2546} 2994}
2547 2995
2548sub update { 2996sub update {
2549 my ($self) = @_; 2997 my ($self) = @_;
2550 2998
… …
2552 3000
2553 return unless $self->{h} > 0; 3001 return unless $self->{h} > 0;
2554 3002
2555 delete $self->{texture}; 3003 delete $self->{texture};
2556 3004
2557 $ROOT->on_post_alloc ($self, sub { 3005 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate;
3007
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 3009
2560 if (delete $self->{need_reflow}) {
2561 my $height = 0;
2562
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2578
2579 $self->{height} = $height;
2580
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582
2583 delete $self->{texture};
2584 }
2585
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 3011 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 3012 glClear GL_COLOR_BUFFER_BIT;
2589 3013
3014 package CFPlus::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h});
3017
3018 my $top = int $self->{children}[1]{range}[0];
3019
3020 my $paridx = 0;
3021 my $top_paragraph;
2590 my $top = int $self->{children}[1]{range}[0]; 3022 my $top = int $self->{children}[1]{range}[0];
2591 3023
2592 my $y0 = $top; 3024 my $y0 = $top;
2593 my $y1 = $top + $H; 3025 my $y1 = $top + $H;
2594 3026
2595 my $y = 0;
2596
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}}) { 3027 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 3028 my $h = $para->{h};
3029 my $y = $para->{y};
2607 3030
2608 if ($y0 < $y + $h && $y < $y1) { 3031 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 3032 my $layout = $self->get_layout ($para);
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 3033
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3034 $layout->render ($para->{indent}, $y - $y0);
2614 3035
2615 glRasterPos $par->[3], $y - $y0; 3036 if (my @w = @{ $para->{widget} }) {
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3037 my @s = $layout->get_shapes;
3038
3039 for (@w) {
3040 my ($dx, $dy) = splice @s, 0, 2, ();
3041
3042 $_->{x} = $dx + $para->{indent};
3043 $_->{y} = $dy + $y - $y0;
3044
3045 $_->draw;
3046 }
3047 }
2617 } 3048 }
2618 3049
2619 $y += $h; 3050 $paridx++;
3051 $top_paragraph ||= $paridx if $y >= $top;
2620 } 3052 }
2621 3053
2622 glDisable GL_BLEND; 3054 $self->{top_paragraph} = $top_paragraph;
2623 }; 3055 };
2624 }); 3056 });
3057}
3058
3059sub reconfigure {
3060 my ($self) = @_;
3061
3062 $self->SUPER::reconfigure;
3063
3064 $_->{w} = 1e10 for @{ $self->{par} };
3065 $self->reflow;
2625} 3066}
2626 3067
2627sub _draw { 3068sub _draw {
2628 my ($self) = @_; 3069 my ($self) = @_;
2629 3070
… …
2632 glColor 0, 0, 0, 1; 3073 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3074 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 3075 glDisable GL_TEXTURE_2D;
2635 3076
2636 $self->{children}[1]->draw; 3077 $self->{children}[1]->draw;
2637
2638} 3078}
2639 3079
2640############################################################################# 3080#############################################################################
2641 3081
2642package CFClient::UI::Animator; 3082package CFPlus::UI::Animator;
2643 3083
2644use CFClient::OpenGL; 3084use CFPlus::OpenGL;
2645 3085
2646our @ISA = CFClient::UI::Bin::; 3086our @ISA = CFPlus::UI::Bin::;
2647 3087
2648sub moveto { 3088sub moveto {
2649 my ($self, $x, $y) = @_; 3089 my ($self, $x, $y) = @_;
2650 3090
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3091 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 3119 glPopMatrix;
2680} 3120}
2681 3121
2682############################################################################# 3122#############################################################################
2683 3123
2684package CFClient::UI::Flopper; 3124package CFPlus::UI::Flopper;
2685 3125
2686our @ISA = CFClient::UI::Button::; 3126our @ISA = CFPlus::UI::Button::;
2687 3127
2688sub new { 3128sub new {
2689 my $class = shift; 3129 my $class = shift;
2690 3130
2691 my $self = $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 3143 $self->{other}->toggle_visibility;
2704} 3144}
2705 3145
2706############################################################################# 3146#############################################################################
2707 3147
2708package CFClient::UI::Tooltip; 3148package CFPlus::UI::Tooltip;
2709 3149
2710our @ISA = CFClient::UI::Bin::; 3150our @ISA = CFPlus::UI::Bin::;
2711 3151
2712use CFClient::OpenGL; 3152use CFPlus::OpenGL;
2713 3153
2714sub new { 3154sub new {
2715 my $class = shift; 3155 my $class = shift;
2716 3156
2717 $class->SUPER::new ( 3157 $class->SUPER::new (
… …
2720 ) 3160 )
2721} 3161}
2722 3162
2723sub set_tooltip_from { 3163sub set_tooltip_from {
2724 my ($self, $widget) = @_; 3164 my ($self, $widget) = @_;
3165
3166 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167 if $widget->{tooltip} =~ /^#(.*)$/;
2725 3168
2726 my $tooltip = $widget->{tooltip}; 3169 my $tooltip = $widget->{tooltip};
2727 3170
2728 if ($ENV{CFPLUS_DEBUG} & 2) { 3171 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 3172 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3173 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 3174 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 3175 . "visible $widget->{visible}";
2733 } 3176 }
2734 3177
3178 $tooltip =~ s/^\n+//;
3179 $tooltip =~ s/\n+$//;
3180
2735 $self->add (new CFClient::UI::Label 3181 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 3182 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3183 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 3184 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 3185 style => 1, # FLAG_INVERSE
2740 ellipsise => 0, 3186 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP), 3187 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 ); 3188 );
2743} 3189}
2744 3190
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3194 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3195
2750 ($w + 4, $h + 4) 3196 ($w + 4, $h + 4)
2751} 3197}
2752 3198
2753sub size_allocate { 3199sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
2755 3201
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3202 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3203}
2758 3204
2759sub visibility_change { 3205sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3206 my ($self, $visible) = @_;
2761 3207
2762 return unless $visible; 3208 return unless $visible;
2763 3209
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3210 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3211 my $widget = $self->{owner}
2766 or return; 3212 or return;
2767 3213
3214 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3215 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3216
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3217 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3218 if $x + $self->{w} > $self->{root}{w};
2772 3219
2773 $self->move_abs ($x, $y); 3220 $self->move_abs ($x, $y);
3221 } else {
3222 $self->hide;
3223 }
2774 }); 3224 });
2775} 3225}
2776 3226
2777sub _draw { 3227sub _draw {
2778 my ($self) = @_; 3228 my ($self) = @_;
… …
2802 $self->SUPER::_draw; 3252 $self->SUPER::_draw;
2803} 3253}
2804 3254
2805############################################################################# 3255#############################################################################
2806 3256
2807package CFClient::UI::Face; 3257package CFPlus::UI::Face;
2808 3258
2809our @ISA = CFClient::UI::Base::; 3259our @ISA = CFPlus::UI::DrawBG::;
2810 3260
2811use CFClient::OpenGL; 3261use CFPlus::OpenGL;
2812 3262
2813sub new { 3263sub new {
2814 my $class = shift; 3264 my $class = shift;
2815 3265
2816 my $self = $class->SUPER::new ( 3266 my $self = $class->SUPER::new (
… …
2851sub _draw { 3301sub _draw {
2852 my ($self) = @_; 3302 my ($self) = @_;
2853 3303
2854 return unless $::CONN; 3304 return unless $::CONN;
2855 3305
3306 $self->SUPER::_draw;
3307
2856 my $face; 3308 my $face;
2857 3309
2858 if ($self->{frame}) { 3310 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}]; 3311 my $anim = $::CONN->{anim}[$self->{anim}];
2860 3312
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3324 glDisable GL_TEXTURE_2D;
2873 } 3325 }
2874} 3326}
2875 3327
2876sub DESTROY { 3328sub destroy {
2877 my ($self) = @_; 3329 my ($self) = @_;
2878 3330
2879 $self->{timer}->cancel 3331 $self->{timer}->cancel
2880 if $self->{timer}; 3332 if $self->{timer};
2881 3333
2882 $self->SUPER::DESTROY; 3334 $self->SUPER::destroy;
2883} 3335}
2884 3336
2885############################################################################# 3337#############################################################################
2886 3338
2887package CFClient::UI::Buttonbar; 3339package CFPlus::UI::Buttonbar;
2888 3340
2889our @ISA = CFClient::UI::HBox::; 3341our @ISA = CFPlus::UI::HBox::;
2890 3342
2891# TODO: should actualyl wrap buttons and other goodies. 3343# TODO: should actually wrap buttons and other goodies.
2892 3344
2893############################################################################# 3345#############################################################################
2894 3346
2895package CFClient::UI::Menu; 3347package CFPlus::UI::Menu;
2896 3348
2897our @ISA = CFClient::UI::FancyFrame::; 3349our @ISA = CFPlus::UI::Toplevel::;
2898 3350
2899use CFClient::OpenGL; 3351use CFPlus::OpenGL;
2900 3352
2901sub new { 3353sub new {
2902 my $class = shift; 3354 my $class = shift;
2903 3355
2904 my $self = $class->SUPER::new ( 3356 my $self = $class->SUPER::new (
2905 items => [], 3357 items => [],
2906 z => 100, 3358 z => 100,
2907 @_, 3359 @_,
2908 ); 3360 );
2909 3361
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3362 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3363
2912 for my $item (@{ $self->{items} }) { 3364 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3365 my ($widget, $cb, $tooltip) = @$item;
2914 3366
2915 # handle various types of items, only text for now 3367 # handle various types of items, only text for now
2916 if (!ref $widget) { 3368 if (!ref $widget) {
3369 if ($widget =~ /\t/) {
3370 my ($left, $right) = split /\t/, $widget, 2;
3371
2917 $widget = new CFClient::UI::Label 3372 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3373 can_hover => 1,
2919 can_events => 1, 3374 can_events => 1,
3375 tooltip => $tooltip,
3376 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1),
3379 ],
3380 ;
3381
3382 } else {
3383 $widget = new CFPlus::UI::Label
3384 can_hover => 1,
3385 can_events => 1,
2920 text => $widget; 3386 markup => $widget,
3387 tooltip => $tooltip;
3388 }
2921 } 3389 }
2922 3390
2923 $self->{item}{$widget} = $item; 3391 $self->{item}{$widget} = $item;
2924 3392
2925 $self->{vbox}->add ($widget); 3393 $self->{vbox}->add ($widget);
… …
2930 3398
2931# popup given the event (must be a mouse button down event currently) 3399# popup given the event (must be a mouse button down event currently)
2932sub popup { 3400sub popup {
2933 my ($self, $ev) = @_; 3401 my ($self, $ev) = @_;
2934 3402
2935 $self->_emit ("popdown"); 3403 $self->emit ("popdown");
2936 3404
2937 # maybe save $GRAB? must be careful about events... 3405 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3406 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3407 $self->{button} = $ev->{button};
2940 3408
2941 $self->show; 3409 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3410 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3411}
2944 3412
2945sub mouse_motion { 3413sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3414 my ($self, $ev, $x, $y) = @_;
2947 3415
2948 # TODO: should use vbox->find_widget or so 3416 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3417 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3418 $self->{hover} = $self->{item}{$HOVER};
2951 3419
2952 0 3420 0
2953} 3421}
2954 3422
2955sub button_up { 3423sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3424 my ($self, $ev, $x, $y) = @_;
2957 3425
2958 if ($ev->{button} == $self->{button}) { 3426 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3427 undef $GRAB;
2960 $self->hide; 3428 $self->hide;
2961 3429
2962 $self->_emit ("popdown"); 3430 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3431 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3432 } else {
2965 return 0 3433 return 0
2966 } 3434 }
2967 3435
2968 1 3436 1
2969} 3437}
2970 3438
2971############################################################################# 3439#############################################################################
2972 3440
2973package CFClient::UI::Multiplexer; 3441package CFPlus::UI::Multiplexer;
2974 3442
2975our @ISA = CFClient::UI::Container::; 3443our @ISA = CFPlus::UI::Container::;
2976 3444
2977sub new { 3445sub new {
2978 my $class = shift; 3446 my $class = shift;
2979 3447
2980 my $self = $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
… …
2994 3462
2995 $self->{current} = $self->{children}[0] 3463 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3464 if @{ $self->{children} };
2997} 3465}
2998 3466
3467sub get_current_page {
3468 my ($self) = @_;
3469
3470 $self->{current}
3471}
3472
2999sub set_current_page { 3473sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3474 my ($self, $page_or_widget) = @_;
3001 3475
3002 my $widget = ref $page_or_widget 3476 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3477 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3478 : $self->{children}[$page_or_widget];
3005 3479
3006 $self->{current} = $widget; 3480 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3481 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3482
3009 $self->_emit (page_changed => $self->{current}); 3483 $self->emit (page_changed => $self->{current});
3010 3484
3011 $self->realloc; 3485 $self->realloc;
3012} 3486}
3013 3487
3014sub visible_children { 3488sub visible_children {
… …
3019 my ($self) = @_; 3493 my ($self) = @_;
3020 3494
3021 $self->{current}->size_request 3495 $self->{current}->size_request
3022} 3496}
3023 3497
3024sub size_allocate { 3498sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3499 my ($self, $w, $h) = @_;
3026 3500
3027 $self->{current}->configure (0, 0, $w, $h); 3501 $self->{current}->configure (0, 0, $w, $h);
3502
3503 1
3028} 3504}
3029 3505
3030sub _draw { 3506sub _draw {
3031 my ($self) = @_; 3507 my ($self) = @_;
3032 3508
3033 $self->{current}->draw; 3509 $self->{current}->draw;
3034} 3510}
3035 3511
3036############################################################################# 3512#############################################################################
3037 3513
3038package CFClient::UI::Notebook; 3514package CFPlus::UI::Notebook;
3039 3515
3040our @ISA = CFClient::UI::VBox::; 3516our @ISA = CFPlus::UI::VBox::;
3041 3517
3042sub new { 3518sub new {
3043 my $class = shift; 3519 my $class = shift;
3044 3520
3045 my $self = $class->SUPER::new ( 3521 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3522 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self 3524 # filter => # will be put between multiplexer and $self
3049 @_, 3525 @_,
3050 ); 3526 );
3051 3527
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3058sub add { 3534sub add {
3059 my ($self, $title, $widget, $tooltip) = @_; 3535 my ($self, $title, $widget, $tooltip) = @_;
3060 3536
3061 Scalar::Util::weaken $self; 3537 Scalar::Util::weaken $self;
3062 3538
3063 $self->{buttonbar}->add (new CFClient::UI::Button 3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3064 markup => $title, 3540 markup => $title,
3065 tooltip => $tooltip, 3541 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) }, 3542 on_activate => sub { $self->set_current_page ($widget) },
3067 ); 3543 );
3068 3544
3069 $self->{multiplexer}->add ($widget); 3545 $self->{multiplexer}->add ($widget);
3070} 3546}
3071 3547
3548sub get_current_page {
3549 my ($self) = @_;
3550
3551 $self->{multiplexer}->get_current_page
3552}
3553
3072sub set_current_page { 3554sub set_current_page {
3073 my ($self, $page) = @_; 3555 my ($self, $page) = @_;
3074 3556
3075 $self->{multiplexer}->set_current_page ($page); 3557 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3558 $self->emit (page_changed => $self->{multiplexer}{current});
3077} 3559}
3078 3560
3079############################################################################# 3561#############################################################################
3080 3562
3563package CFPlus::UI::Selector;
3564
3565use utf8;
3566
3567our @ISA = CFPlus::UI::Button::;
3568
3569sub new {
3570 my $class = shift;
3571
3572 my $self = $class->SUPER::new (
3573 options => [], # [value, title, longdesc], ...
3574 value => undef,
3575 @_,
3576 );
3577
3578 $self->_set_value ($self->{value});
3579
3580 $self
3581}
3582
3583sub invoke_button_down {
3584 my ($self, $ev) = @_;
3585
3586 my @menu_items;
3587
3588 for (@{ $self->{options} }) {
3589 my ($value, $title, $tooltip) = @$_;
3590
3591 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3592 }
3593
3594 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3595}
3596
3597sub _set_value {
3598 my ($self, $value) = @_;
3599
3600 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3601 or return;
3602
3603 $self->{value} = $item->[0];
3604 $self->set_markup ("$item->[1] ⇓");
3605 $self->set_tooltip ($item->[2]);
3606}
3607
3608sub set_value {
3609 my ($self, $value) = @_;
3610
3611 return unless $self->{value} ne $value;
3612
3613 $self->_set_value ($value);
3614 $self->emit (changed => $value);
3615}
3616
3617#############################################################################
3618
3081package CFClient::UI::Statusbox; 3619package CFPlus::UI::Statusbox;
3082 3620
3083our @ISA = CFClient::UI::VBox::; 3621our @ISA = CFPlus::UI::VBox::;
3084 3622
3085sub new { 3623sub new {
3086 my $class = shift; 3624 my $class = shift;
3087 3625
3088 my $self = $class->SUPER::new ( 3626 my $self = $class->SUPER::new (
… …
3100sub reorder { 3638sub reorder {
3101 my ($self) = @_; 3639 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 3640 my $NOW = Time::HiRes::time;
3103 3641
3104 # freeze display when hovering over any label 3642 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 3643 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3644 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 3645 values %{ $self->{item} };
3108 3646
3109 while (my ($k, $v) = each %{ $self->{item} }) { 3647 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3648 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 3649 }
… …
3132 for ($short) { 3670 for ($short) {
3133 s/^\s+//; 3671 s/^\s+//;
3134 s/\s+/ /g; 3672 s/\s+/ /g;
3135 } 3673 }
3136 3674
3137 new CFClient::UI::Label 3675 new CFPlus::UI::Label
3138 markup => $short, 3676 markup => $short,
3139 tooltip => $item->{tooltip}, 3677 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 3678 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 3679 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 3680 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3180 $item->{count}++; 3718 $item->{count}++;
3181 } else { 3719 } else {
3182 $item->{count} = 1; 3720 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3721 $item->{text} = $item->{tooltip} = $text;
3184 } 3722 }
3185 $item->{id} = ++$self->{id}; 3723 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3724 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3725 delete $item->{label};
3188 } else { 3726 } else {
3189 $self->{item}{$group} = { 3727 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3728 id => ++$self->{id},
… …
3196 count => 1, 3734 count => 1,
3197 %arg, 3735 %arg,
3198 }; 3736 };
3199 } 3737 }
3200 3738
3739 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3740 $self->reorder;
3741 });
3202} 3742}
3203 3743
3204sub reconfigure { 3744sub reconfigure {
3205 my ($self) = @_; 3745 my ($self) = @_;
3206 3746
… …
3209 3749
3210 $self->reorder; 3750 $self->reorder;
3211 $self->SUPER::reconfigure; 3751 $self->SUPER::reconfigure;
3212} 3752}
3213 3753
3214sub DESTROY { 3754sub destroy {
3215 my ($self) = @_; 3755 my ($self) = @_;
3216 3756
3217 $self->{timer}->cancel; 3757 $self->{timer}->cancel;
3218 3758
3219 $self->SUPER::DESTROY; 3759 $self->SUPER::destroy;
3220} 3760}
3221 3761
3222############################################################################# 3762#############################################################################
3223 3763
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $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}
3263
3264#############################################################################
3265
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;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
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}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root; 3764package CFPlus::UI::Root;
3520 3765
3521our @ISA = CFClient::UI::Container::; 3766our @ISA = CFPlus::UI::Container::;
3522 3767
3523use List::Util qw(min max); 3768use List::Util qw(min max);
3524 3769
3525use CFClient::OpenGL; 3770use CFPlus::OpenGL;
3526 3771
3527sub new { 3772sub new {
3528 my $class = shift; 3773 my $class = shift;
3529 3774
3530 my $self = $class->SUPER::new ( 3775 my $self = $class->SUPER::new (
… …
3555 $coord = $max - $size if $coord > $max - $size; 3800 $coord = $max - $size if $coord > $max - $size;
3556 3801
3557 int $coord + 0.5 3802 int $coord + 0.5
3558} 3803}
3559 3804
3560sub size_allocate { 3805sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3806 my ($self, $w, $h) = @_;
3562 3807
3563 for my $child ($self->children) { 3808 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3809 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3810
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3814 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3815 $Y = _to_pixel $Y, $H, $self->{h};
3571 3816
3572 $child->configure ($X, $Y, $W, $H); 3817 $child->configure ($X, $Y, $W, $H);
3573 } 3818 }
3819
3820 1
3574} 3821}
3575 3822
3576sub coord2local { 3823sub coord2local {
3577 my ($self, $x, $y) = @_; 3824 my ($self, $x, $y) = @_;
3578 3825
… …
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 3952
3706 $w = 0 if $w < 0; 3953 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0; 3954 $h = 0 if $h < 0;
3708 3955
3956 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h;
3958
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964
3709 $w = int $w + 0.5; 3965 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 3966 $h = int $h + 0.5;
3711 3967
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w}; 3969 $widget->{old_w} = $widget->{w};
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3992 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 3993 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 3994 glLoadIdentity;
3739 3995
3740 { 3996 {
3741 package CFClient::UI::Base; 3997 package CFPlus::UI::Base;
3742 3998
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 3999 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 4000 (0, 0, $self->{w}, $self->{h});
3745 }
3746 4001
3747 $self->_draw; 4002 $self->_draw;
4003 }
3748} 4004}
3749 4005
3750############################################################################# 4006#############################################################################
3751 4007
3752package CFClient::UI; 4008package CFPlus::UI;
3753 4009
3754$ROOT = new CFClient::UI::Root; 4010$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4011$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4012
37571 40131
3758 4014

Diff Legend

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