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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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