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.304 by elmex, Tue Jun 13 11:01:04 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
1095 unless ($self->{no_close_button}) { 1371 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1372 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1373 new CFPlus::UI::ImageButton
1098 image => 'x1_close.png', 1374 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1375 on_activate => sub { $self->emit ("delete") };
1100 1376
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1377 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1378 }
1103 1379
1104 $self 1380 $self
1105} 1381}
1106 1382
1107sub add { 1383sub add {
1108 my ($self, @widgets) = @_; 1384 my ($self, @widgets) = @_;
1109 1385
1110 $self->SUPER::add (@widgets); 1386 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1387 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $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};
1113} 1389}
1114 1390
1115sub border { 1391sub border {
1116 int $_[0]{border} * $::FONTSIZE 1392 int $_[0]{border} * $::FONTSIZE
1117} 1393}
… …
1120 my ($self) = @_; 1396 my ($self) = @_;
1121 1397
1122 $self->{title_widget}->size_request 1398 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1399 if $self->{title_widget};
1124 1400
1125 $self->{close_btn}->size_request 1401 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1402 if $self->{close_button};
1127 1403
1128 my ($w, $h) = $self->SUPER::size_request; 1404 my ($w, $h) = $self->SUPER::size_request;
1129 1405
1130 ( 1406 (
1131 $w + $self->border * 2, 1407 $w + $self->border * 2,
1132 $h + $self->border * 2, 1408 $h + $self->border * 2,
1133 ) 1409 )
1134} 1410}
1135 1411
1136sub size_allocate { 1412sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1138 1414
1139 if ($self->{title_widget}) { 1415 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1416 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1417 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1418 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1419 }
1144 1420
1145 my $border = $self->border; 1421 my $border = $self->border;
1146 1422
1147 $h -= List::Util::max 0, $border * 2; 1423 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1424 $w -= List::Util::max 0, $border * 2;
1149 1425
1150 $self->child->configure ($border, $border, $w, $h); 1426 $self->child->configure ($border, $border, $w, $h);
1151 1427
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1428 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1429 if $self->{close_button};
1154}
1155 1430
1431 1
1432}
1433
1434sub invoke_delete {
1435 my ($self) = @_;
1436
1437 $self->hide;
1438
1439 1
1440}
1441
1156sub button_down { 1442sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1158 1444
1159 my ($w, $h) = @$self{qw(w h)}; 1445 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1446 my $border = $self->border;
1161 1447
… …
1192 1478
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1479 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1480
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1481 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1482 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1483 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1484 };
1199 } else { 1485 } else {
1200 return 0; 1486 return 0;
1201 } 1487 }
1202 1488
1203 1 1489 1
1204} 1490}
1205 1491
1206sub button_up { 1492sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1493 my ($self, $ev, $x, $y) = @_;
1208 1494
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1495 ! ! delete $self->{motion}
1213} 1496}
1214 1497
1215sub mouse_motion { 1498sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1499 my ($self, $ev, $x, $y) = @_;
1217 1500
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1501 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1502
1220 !!$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
1221} 1512}
1222 1513
1223sub _draw { 1514sub _draw {
1224 my ($self) = @_; 1515 my ($self) = @_;
1225 1516
… …
1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1233 1524
1234 my $border = $self->border; 1525 my $border = $self->border;
1235 1526
1236 glColor @{ $self->{border_bg} }; 1527 glColor @{ $self->{border_bg} };
1237 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1528 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1529 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1530 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1240 $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);
1241 1546
1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1547 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1243 glColor @{ $self->{bg} }; 1548 glColor @{ $self->{bg} };
1244 1549
1245 # TODO: repeat texture not scale 1550 # TODO: repeat texture not scale
… …
1258 $self->{title_widget}->_draw; 1563 $self->{title_widget}->_draw;
1259 1564
1260 glTranslate 0, - ($border - $self->{h}); 1565 glTranslate 0, - ($border - $self->{h});
1261 } 1566 }
1262 1567
1263 $self->{close_btn}->draw 1568 $self->{close_button}->draw
1264 if $self->{close_btn}; 1569 if $self->{close_button};
1265} 1570}
1266 1571
1267############################################################################# 1572#############################################################################
1268 1573
1269package CFClient::UI::Table; 1574package CFPlus::UI::Table;
1270 1575
1271our @ISA = CFClient::UI::Base::; 1576our @ISA = CFPlus::UI::Container::;
1272 1577
1273use List::Util qw(max sum); 1578use List::Util qw(max sum);
1274 1579
1275use CFClient::OpenGL; 1580use CFPlus::OpenGL;
1276 1581
1277sub new { 1582sub new {
1278 my $class = shift; 1583 my $class = shift;
1279 1584
1280 $class->SUPER::new ( 1585 $class->SUPER::new (
1281 col_expand => [], 1586 col_expand => [],
1587 row_expand => [],
1282 @_, 1588 @_,
1283 ) 1589 )
1284} 1590}
1285 1591
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288}
1289
1290sub add { 1592sub add {
1291 my ($self, $x, $y, $child) = @_; 1593 my ($self, @widgets) = @_;
1292 1594
1293 $child->set_parent ($self); 1595 for my $child (@widgets) {
1294 $self->{children}[$y][$x] = $child; 1596 $child->{c_rowspan} ||= 1;
1597 $child->{c_colspan} ||= 1;
1598 }
1295 1599
1296 $self->realloc; 1600 $self->SUPER::add (@widgets);
1297} 1601}
1298 1602
1299sub 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 {
1300 my ($self, $child) = @_; 1621 my ($self) = @_;
1301 1622
1302 # TODO: not yet implemented 1623 my (@w, @h);
1303}
1304
1305# TODO: move to container class maybe? send children a signal on removal?
1306sub clear {
1307 my ($self) = @_;
1308 1624
1309 my @children = $self->children; 1625 my @children = $self->children;
1310 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 }
1311 1636 }
1312 for (@children) {
1313 delete $_->{parent};
1314 $_->hide;
1315 }
1316 1637
1317 $self->realloc; 1638 # second pass, rows
1318} 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1319
1320sub get_wh {
1321 my ($self) = @_;
1322
1323 my (@w, @h);
1324
1325 for my $y (0 .. $#{$self->{children}}) {
1326 my $row = $self->{children}[$y]
1327 or next;
1328
1329 for my $x (0 .. $#$row) {
1330 my $widget = $row->[$x]
1331 or next;
1332 my ($w, $h) = @$widget{qw(req_w req_h)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1333 1641
1334 $w[$x] = max $w[$x], $w; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1335 $h[$y] = max $h[$y], $h; 1643
1644 if ($h > $sh) {
1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1336 } 1646 }
1337 } 1647 }
1338 1648
1339 (\@w, \@h) 1649 (\@w, \@h)
1340} 1650}
… …
1348 (sum @$ws), 1658 (sum @$ws),
1349 (sum @$hs), 1659 (sum @$hs),
1350 ) 1660 )
1351} 1661}
1352 1662
1353sub size_allocate { 1663sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1355 1665
1356 my ($ws, $hs) = $self->get_wh; 1666 my ($ws, $hs) = $self->get_wh;
1357 1667
1358 my $req_w = (sum @$ws) || 1; 1668 my $req_w = (sum @$ws) || 1;
1359 my $req_h = (sum @$hs) || 1; 1669 my $req_h = (sum @$hs) || 1;
1360 1670
1361 # TODO: nicer code && do row_expand 1671 # now linearly scale the rows/columns to the allocated size
1362 my @col_expand = @{$self->{col_expand}}; 1672 my @col_expand = @{$self->{col_expand}};
1363 @col_expand = (1) x @$ws unless @col_expand; 1673 @col_expand = (1) x @$ws unless @col_expand;
1364 my $col_expand = (sum @col_expand) || 1; 1674 my $col_expand = (sum @col_expand) || 1;
1365 1675
1366 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1676 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1677
1370 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
1371 CFClient::UI::harmonize $hs; 1686 CFPlus::UI::harmonize $hs;
1372 1687
1373 my $y; 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1374 1690
1375 for my $r (0 .. $#{$self->{children}}) { 1691 for my $widget ($self->children) {
1376 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)};
1377 or next;
1378 1693
1379 my $x = 0; 1694 $widget->configure (
1380 my $row_h = $hs->[$r]; 1695 $x[$c], $y[$r],
1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1381 1697 );
1382 for my $c (0 .. $#$row) { 1698 }
1383 my $col_w = $ws->[$c];
1384 1699
1385 if (my $widget = $row->[$c]) { 1700 1
1386 $widget->configure ($x, $y, $col_w, $row_h); 1701}
1387 }
1388 1702
1389 $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};
1390 } 1730 }
1391
1392 $y += $row_h;
1393 } 1731 }
1394 1732
1395} 1733 my $W = $x2 - $x1;
1734 my $H = $y2 - $y1;
1396 1735
1397sub 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 {
1398 my ($self, $x, $y) = @_; 1754 my ($self, $W, $H) = @_;
1399 1755
1400 $x -= $self->{x}; 1756 for my $child ($self->visible_children) {
1401 $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;
1402 1759
1403 my $res; 1760 $x += $child->{c_halign} * $child->{req_w};
1761 $y += $child->{c_valign} * $child->{req_h};
1404 1762
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1406 $res = $_->find_widget ($x, $y) 1764 }
1407 and return $res; 1765
1408 } 1766 1
1409
1410 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411}
1412
1413sub _draw {
1414 my ($self) = @_;
1415
1416 for (grep $_, @{$self->{children}}) {
1417 $_->draw for grep $_, @$_;
1418 }
1419} 1767}
1420 1768
1421############################################################################# 1769#############################################################################
1422 1770
1423package CFClient::UI::Box; 1771package CFPlus::UI::Box;
1424 1772
1425our @ISA = CFClient::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1426 1774
1427sub size_request { 1775sub size_request {
1428 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1429 1779
1430 $self->{vertical} 1780 $self->{vertical}
1431 ? ( 1781 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1434 ) 1784 )
1435 : ( 1785 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1438 ) 1788 )
1439} 1789}
1440 1790
1441sub size_allocate { 1791sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
1443 1793
1444 my $space = $self->{vertical} ? $h : $w; 1794 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1795 my @children = $self->visible_children;
1446 1796
1447 my @req; 1797 my @req;
1448 1798
1449 if ($self->{homogeneous}) { 1799 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1800 @req = ($space / (@children || 1)) x @children;
1451 } else { 1801 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1802 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1803 my $req = List::Util::sum @req;
1454 1804
1455 if ($req > $space) { 1805 if ($req > $space) {
1456 # ah well, not enough space 1806 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1807 $_ *= $space / $req for @req;
1458 } else { 1808 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1809 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1810
1461 $space = ($space - $req) / $expand; # remaining space to give away 1811 $space = ($space - $req) / $expand; # remaining space to give away
1462 1812
1463 $req[$_] += $space * $children->[$_]{expand} 1813 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1814 for 0 .. $#children;
1465 } 1815 }
1466 } 1816 }
1467 1817
1468 CFClient::UI::harmonize \@req; 1818 CFPlus::UI::harmonize \@req;
1469 1819
1470 my $pos = 0; 1820 my $pos = 0;
1471 for (0 .. $#$children) { 1821 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1822 my $alloc = $req[$_];
1473 $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));
1474 1824
1475 $pos += $alloc; 1825 $pos += $alloc;
1476 } 1826 }
1477 1827
1478 1 1828 1
1479} 1829}
1480 1830
1481############################################################################# 1831#############################################################################
1482 1832
1483package CFClient::UI::HBox; 1833package CFPlus::UI::HBox;
1484 1834
1485our @ISA = CFClient::UI::Box::; 1835our @ISA = CFPlus::UI::Box::;
1486 1836
1487sub new { 1837sub new {
1488 my $class = shift; 1838 my $class = shift;
1489 1839
1490 $class->SUPER::new ( 1840 $class->SUPER::new (
… …
1493 ) 1843 )
1494} 1844}
1495 1845
1496############################################################################# 1846#############################################################################
1497 1847
1498package CFClient::UI::VBox; 1848package CFPlus::UI::VBox;
1499 1849
1500our @ISA = CFClient::UI::Box::; 1850our @ISA = CFPlus::UI::Box::;
1501 1851
1502sub new { 1852sub new {
1503 my $class = shift; 1853 my $class = shift;
1504 1854
1505 $class->SUPER::new ( 1855 $class->SUPER::new (
… …
1508 ) 1858 )
1509} 1859}
1510 1860
1511############################################################################# 1861#############################################################################
1512 1862
1513package CFClient::UI::Label; 1863package CFPlus::UI::Label;
1514 1864
1515our @ISA = CFClient::UI::DrawBG::; 1865our @ISA = CFPlus::UI::DrawBG::;
1516 1866
1517use CFClient::OpenGL; 1867use CFPlus::OpenGL;
1518 1868
1519sub new { 1869sub new {
1520 my ($class, %arg) = @_; 1870 my ($class, %arg) = @_;
1521 1871
1522 my $self = $class->SUPER::new ( 1872 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1875 #active_bg => none
1526 #font => default_font 1876 #font => default_font
1527 #text => initial text 1877 #text => initial text
1528 #markup => initial narkup 1878 #markup => initial narkup
1529 #max_w => maximum pixel width 1879 #max_w => maximum pixel width
1880 #style => 0, # render flags
1530 ellipsise => 3, # end 1881 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1882 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1883 fontsize => 1,
1533 align => -1, 1884 align => -1,
1534 valign => -1, 1885 valign => -1,
1535 padding_x => 2, 1886 padding_x => 2,
1536 padding_y => 2, 1887 padding_y => 2,
1537 can_events => 0, 1888 can_events => 0,
1538 %arg 1889 %arg
1539 ); 1890 );
1540 1891
1541 if (exists $self->{template}) { 1892 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1893 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1894 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1895 $self->{template} = $layout;
1545 } 1896 }
1546 1897
1547 if (exists $self->{markup}) { 1898 if (exists $self->{markup}) {
… …
1551 } 1902 }
1552 1903
1553 $self 1904 $self
1554} 1905}
1555 1906
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1907sub update {
1567 my ($self) = @_; 1908 my ($self) = @_;
1568 1909
1569 delete $self->{texture}; 1910 delete $self->{texture};
1570 $self->SUPER::update; 1911 $self->SUPER::update;
… …
1575 1916
1576 delete $self->{ox}; 1917 delete $self->{ox};
1577 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1578} 1919}
1579 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1580sub set_text { 1927sub set_text {
1581 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1582 1929
1583 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
1585 1932
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1933 $self->{layout}->set_text ($text);
1588 1934
1589 delete $self->{size_req}; 1935 delete $self->{size_req};
1590 $self->realloc; 1936 $self->realloc;
1591 $self->update; 1937 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1943 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1944 $self->{text} = "M$markup";
1599 1945
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1946 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1947
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1948 $self->{layout}->set_markup ($markup);
1604 1949
1605 delete $self->{size_req}; 1950 delete $self->{size_req};
1606 $self->realloc; 1951 $self->realloc;
1607 $self->update; 1952 $self->update;
… …
1609 1954
1610sub size_request { 1955sub size_request {
1611 my ($self) = @_; 1956 my ($self) = @_;
1612 1957
1613 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1614 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1615 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1616 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1619 1966
1620 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
1621 1968
1622 if (exists $self->{template}) { 1969 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1973
1626 my ($w2, $h2) = $self->{template}->size; 1974 my ($w2, $h2) = $self->{template}->size;
1627 1975
1628 $w = List::Util::max $w, $w2; 1976 $w = List::Util::max $w, $w2;
… …
1633 }; 1981 };
1634 1982
1635 @{ $self->{size_req} } 1983 @{ $self->{size_req} }
1636} 1984}
1637 1985
1986sub baseline_shift {
1987 $_[0]{layout}->descent
1988}
1989
1638sub size_allocate { 1990sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1991 my ($self, $w, $h) = @_;
1640 1992
1641 delete $self->{ox}; 1993 delete $self->{ox};
1642 1994
1643 delete $self->{texture} 1995 delete $self->{texture}
1644 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
1645} 1999}
1646 2000
1647sub set_fontsize { 2001sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2002 my ($self, $fontsize) = @_;
1649 2003
1650 $self->{fontsize} = $fontsize; 2004 $self->{fontsize} = $fontsize;
2005 delete $self->{size_req};
1651 delete $self->{texture}; 2006 delete $self->{texture};
1652 2007
1653 $self->realloc; 2008 $self->realloc;
1654} 2009}
1655 2010
1656sub reconfigure { 2011sub reconfigure {
1657 my ($self) = @_; 2012 my ($self) = @_;
1658 2013
1659 delete $self->{size_req}; 2014 delete $self->{size_req};
2015 delete $self->{texture};
1660 2016
1661 $self->SUPER::reconfigure; 2017 $self->SUPER::reconfigure;
1662} 2018}
1663 2019
1664sub _draw { 2020sub _draw {
1665 my ($self) = @_; 2021 my ($self) = @_;
1666 2022
1667 $self->SUPER::_draw; # draw background, if applicable 2023 $self->SUPER::_draw; # draw background, if applicable
1668 2024
1669 my $tex = $self->{texture} ||= do { 2025 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2026 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2027 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2028 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2029 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2032
1677 new_from_layout CFClient::Texture $self->{layout} 2033 [$self->{layout}->size]
1678 }; 2034 };
1679 2035
1680 unless (exists $self->{ox}) { 2036 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2037 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2038 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
1684 2040
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1688 }; 2046 };
1689 2047
1690 glEnable GL_TEXTURE_2D; 2048# unless ($self->{list}) {
1691 2049# $self->{list} = CFPlus::OpenGL::glGenList;
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2050# CFPlus::OpenGL::glNewList $self->{list};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694 2052# CFPlus::OpenGL::glEndList;
1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 } 2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
1703 2056
1704 glDisable GL_TEXTURE_2D; 2057 $self->{layout}->draw;
1705} 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#}
1706 2067
1707############################################################################# 2068#############################################################################
1708 2069
1709package CFClient::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1710 2071
1711our @ISA = CFClient::UI::Label::; 2072our @ISA = CFPlus::UI::Label::;
1712 2073
1713use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1714 2075
1715sub new { 2076sub new {
1716 my $class = shift; 2077 my $class = shift;
1717 2078
1718 $class->SUPER::new ( 2079 $class->SUPER::new (
1719 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1720 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
1721 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
1722 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
1723 can_hover => 1, 2086 can_hover => 1,
1724 can_focus => 1, 2087 can_focus => 1,
1725 valign => 0, 2088 valign => 0,
1726 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1727 #text => ... 2091 #text => ...
1728 #hidden => "*", 2092 #hidden => "*",
1729 @_ 2093 @_
1730 ) 2094 )
1731} 2095}
… …
1742 2106
1743 $text =~ s/./*/g if $self->{hidden}; 2107 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 2108 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 2109 delete $self->{size_req};
1746 2110
1747 $self->_emit (changed => $self->{text}); 2111 $self->emit (changed => $self->{text});
1748 2112
1749 $self->realloc; 2113 $self->realloc;
1750 $self->update; 2114 $self->update;
1751} 2115}
1752 2116
… …
1767 my ($w, $h) = $self->SUPER::size_request; 2131 my ($w, $h) = $self->SUPER::size_request;
1768 2132
1769 ($w + 1, $h) # add 1 for cursor 2133 ($w + 1, $h) # add 1 for cursor
1770} 2134}
1771 2135
1772sub key_down { 2136sub invoke_key_down {
1773 my ($self, $ev) = @_; 2137 my ($self, $ev) = @_;
1774 2138
1775 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1778 2142
1779 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;
1780 2146
1781 if ($uni == 8) { 2147 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } 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 = "";
1790 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 2171 $self->emit ('escape');
1795 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2176 } else {
1798 return 0; 2177 return 0;
1799 } 2178 }
1800 2179
1801 $self->_set_text ($text); 2180 $self->_set_text ($text);
1802 2181
1803 $self->realloc; 2182 $self->realloc;
2183 $self->update;
1804 2184
1805 1 2185 1
1806} 2186}
1807 2187
1808sub focus_in { 2188sub invoke_focus_in {
1809 my ($self) = @_; 2189 my ($self) = @_;
1810 2190
1811 $self->{last_activity} = $::NOW; 2191 $self->{last_activity} = $::NOW;
1812 2192
1813 $self->SUPER::focus_in; 2193 $self->SUPER::invoke_focus_in
1814} 2194}
1815 2195
1816sub button_down { 2196sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1818 2198
1819 $self->SUPER::button_down ($ev, $x, $y); 2199 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2200
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2201 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2202
1823 # byte-index to char-index 2203 # byte-index to char-index
1824 my $text = $self->{text}; 2204 my $text = $self->{text};
1825 utf8::encode $text; 2205 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2206 $self->{cursor} = length $text;
1827 2207
1828 $self->_set_text ($self->{text}); 2208 $self->_set_text ($self->{text});
1829 $self->update; 2209 $self->update;
1830 2210
1831 1 2211 1
1832} 2212}
1833 2213
1834sub mouse_motion { 2214sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1836# 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#
1837 2217
1838 0 2218 1
1839} 2219}
1840 2220
1841sub _draw { 2221sub _draw {
1842 my ($self) = @_; 2222 my ($self) = @_;
1843 2223
… …
1850 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
1851 } 2231 }
1852 2232
1853 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855 glBegin GL_QUADS;
1856 glVertex 0 , 0;
1857 glVertex 0 , $self->{h};
1858 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
1859 glVertex $self->{w}, 0;
1860 glEnd;
1861 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
1862 2237
1863 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
1864 2239
1865 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
1867 2242
1868 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
1869 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
1870 utf8::encode $text; 2245 utf8::encode $text;
1871 2246
1872 @$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);
1873 } 2248 }
1874 2249
1875 glColor @{$self->{fg}}; 2250 glColor_premultiply @{$self->{active_fg}};
1876 glBegin GL_LINES; 2251 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1878 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};
1879 glEnd; 2254 glEnd;
1880 }
1881}
1882 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
1883package CFClient::UI::Entry; 2274package CFPlus::UI::Entry;
1884 2275
1885our @ISA = CFClient::UI::EntryBase::; 2276our @ISA = CFPlus::UI::EntryBase::;
1886 2277
1887use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1888 2279
1889sub key_down { 2280sub invoke_key_down {
1890 my ($self, $ev) = @_; 2281 my ($self, $ev) = @_;
1891 2282
1892 my $sym = $ev->{sym}; 2283 my $sym = $ev->{sym};
1893 2284
1894 if ($sym == 13) { 2285 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2286 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2287 my $txt = $self->get_text;
2288
1897 $self->{history_pointer} = -1; 2289 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2290 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2291 $self->emit (activate => $txt);
1900 $self->update; 2292 $self->update;
1901 2293
1902 } elsif ($sym == CFClient::SDLK_UP) { 2294 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2295 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2296 $self->{history_saveback} = $self->get_text;
1905 } 2297 }
1906 if (@{$self->{history} || []} > 0) { 2298 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2299 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2301 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2302 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2303 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2304 }
1913 2305
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2306 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2307 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2308 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2309
1918 if ($self->{history_pointer} >= 0) { 2310 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2312 } else {
1921 $self->set_text ($self->{history_saveback}); 2313 $self->set_text ($self->{history_saveback});
1922 } 2314 }
1923 2315
1924 } else { 2316 } else {
1925 return $self->SUPER::key_down ($ev) 2317 return $self->SUPER::invoke_key_down ($ev)
1926 } 2318 }
1927 2319
1928 1 2320 1
1929} 2321}
1930 2322
1931############################################################################# 2323#############################################################################
1932 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
1933package CFClient::UI::Button; 2364package CFPlus::UI::ButtonBin;
1934 2365
1935our @ISA = CFClient::UI::Label::; 2366our @ISA = CFPlus::UI::Bin::;
1936 2367
1937use CFClient::OpenGL; 2368use CFPlus::OpenGL;
1938 2369
1939my @tex = 2370my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2372 qw(b1_button_inactive.png b1_button_active.png);
1942 2373
1943sub new { 2374sub new {
1944 my $class = shift; 2375 my $class = shift;
1945 2376
1946 $class->SUPER::new ( 2377 $class->SUPER::new (
1947 padding_x => 4,
1948 padding_y => 4,
1949 fg => [1, 1, 1],
1950 active_fg => [0, 0, 1],
1951 can_hover => 1, 2378 can_hover => 1,
1952 align => 0, 2379 align => 0,
1953 valign => 0, 2380 valign => 0,
1954 can_events => 1, 2381 can_events => 1,
1955 @_ 2382 @_
1956 ) 2383 )
1957} 2384}
1958 2385
1959sub activate { }
1960
1961sub button_up { 2386sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2387 my ($self, $ev, $x, $y) = @_;
1963 2388
1964 $self->emit ("activate") 2389 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2390 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2391 && $y >= 0 && $y < $self->{h};
… …
1969} 2394}
1970 2395
1971sub _draw { 2396sub _draw {
1972 my ($self) = @_; 2397 my ($self) = @_;
1973 2398
1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1975
1976 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1978 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
1979 2402
2403 my $tex = $tex[$GRAB == $self];
1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981 2405
1982 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
1983 2407
1984 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
1985} 2409}
1986 2410
1987############################################################################# 2411#############################################################################
1988 2412
2413package CFPlus::UI::Button;
2414
2415our @ISA = CFPlus::UI::Label::;
2416
2417use CFPlus::OpenGL;
2418
2419my @tex =
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 }
2474 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2475
2476use CFPlus::OpenGL;
2477
2478sub new {
2479 my $class = shift;
2480
2481 $class->SUPER::new (
2482 padding_x => 2,
2483 padding_y => 2,
2484 fg => [1, 1, 1],
2485 active_fg => [1, 1, 0],
2486 bg => [0, 0, 0, 0.2],
2487 active_bg => [1, 1, 1, 0.5],
2488 state => 0,
2489 can_hover => 1,
2490 @_
2491 )
2492}
2493
2494sub size_request {
2495 my ($self) = @_;
2496
2497 (6) x 2
2498}
2499
2500sub toggle {
2501 my ($self) = @_;
2502
2503 $self->{state} = !$self->{state};
2504 $self->emit (changed => $self->{state});
2505 $self->update;
2506}
2507
2508sub invoke_button_down {
2509 my ($self, $ev, $x, $y) = @_;
2510
2511 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2512 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2513 $self->toggle;
2514 } else {
2515 return 0
2516 }
2517
2518 1
2519}
2520
2521sub _draw {
2522 my ($self) = @_;
2523
2524 $self->SUPER::_draw;
2525
2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2527
2528 my ($w, $h) = @$self{qw(w h)};
2529
2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2531
2532 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2533
2534 my $tex = $self->{state} ? $tex[1] : $tex[0];
2535
2536 glEnable GL_TEXTURE_2D;
2537 $tex->draw_quad_alpha (0, 0, $s, $s);
2538 glDisable GL_TEXTURE_2D;
2539}
2540
2541#############################################################################
2542
2543package CFPlus::UI::Image;
2544
2545our @ISA = CFPlus::UI::Base::;
2546
2547use CFPlus::OpenGL;
2548
2549our %texture_cache;
2550
2551sub new {
2552 my $class = shift;
2553
2554 my $self = $class->SUPER::new (
2555 can_events => 0,
2556 scale => 1,
2557 @_,
2558 );
2559
2560 $self->{path} || $self->{tex}
2561 or Carp::croak "'path' or 'tex' attributes required";
2562
2563 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2564 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2565
2566 CFPlus::weaken $texture_cache{$self->{path}};
2567
2568 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2569
2570 $self
2571}
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
2588sub size_request {
2589 my ($self) = @_;
2590
2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2592}
2593
2594sub _draw {
2595 my ($self) = @_;
2596
2597 my $tex = $self->{tex};
2598
2599 my ($w, $h) = ($self->{w}, $self->{h});
2600
2601 if ($self->{rot90}) {
2602 glRotate 90, 0, 0, 1;
2603 glTranslate 0, -$self->{w}, 0;
2604
2605 ($w, $h) = ($h, $w);
2606 }
2607
2608 glEnable GL_TEXTURE_2D;
2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2610
2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2612
2613 glDisable GL_TEXTURE_2D;
2614}
2615
2616#############################################################################
2617
1989package CFClient::UI::ImageButton; 2618package CFPlus::UI::ImageButton;
1990 2619
1991our @ISA = CFClient::UI::Image::; 2620our @ISA = CFPlus::UI::Image::;
1992 2621
1993use CFClient::OpenGL; 2622use CFPlus::OpenGL;
1994 2623
1995my %textures; 2624my %textures;
1996 2625
1997sub new { 2626sub new {
1998 my $class = shift; 2627 my $class = shift;
… …
2008 can_events => 1, 2637 can_events => 1,
2009 @_ 2638 @_
2010 ); 2639 );
2011} 2640}
2012 2641
2013sub activate { } 2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2014 2644
2645 1
2646}
2647
2015sub button_up { 2648sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2017 2650
2018 $self->emit ("activate") 2651 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2652 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2653 && $y >= 0 && $y < $self->{h};
… …
2022 1 2655 1
2023} 2656}
2024 2657
2025############################################################################# 2658#############################################################################
2026 2659
2027package CFClient::UI::CheckBox;
2028
2029our @ISA = CFClient::UI::DrawBG::;
2030
2031my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035use CFClient::OpenGL;
2036
2037sub new {
2038 my $class = shift;
2039
2040 $class->SUPER::new (
2041 padding_x => 2,
2042 padding_y => 2,
2043 fg => [1, 1, 1],
2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
2047 state => 0,
2048 can_hover => 1,
2049 @_
2050 )
2051}
2052
2053sub size_request {
2054 my ($self) = @_;
2055
2056 (6) x 2
2057}
2058
2059sub button_down {
2060 my ($self, $ev, $x, $y) = @_;
2061
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
2070 1
2071}
2072
2073sub _draw {
2074 my ($self) = @_;
2075
2076 $self->SUPER::_draw;
2077
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088 glEnable GL_TEXTURE_2D;
2089 $tex->draw_quad_alpha (0, 0, $s, $s);
2090 glDisable GL_TEXTURE_2D;
2091}
2092
2093#############################################################################
2094
2095package CFClient::UI::Image; 2660package CFPlus::UI::VGauge;
2096 2661
2097our @ISA = CFClient::UI::Base::; 2662our @ISA = CFPlus::UI::Base::;
2098
2099use CFClient::OpenGL;
2100use Carp qw/confess/;
2101
2102our %loaded_images;
2103
2104sub new {
2105 my $class = shift;
2106
2107 my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111 $loaded_images{$self->{image}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119
2120 $self
2121}
2122
2123sub size_request {
2124 my ($self) = @_;
2125
2126 ($self->{tex}->{w}, $self->{tex}->{h})
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131
2132 my $tex = $self->{tex};
2133
2134 my ($w, $h) = ($self->{w}, $self->{h});
2135
2136 if ($self->{rot90}) {
2137 glRotate 90, 0, 0, 1;
2138 glTranslate 0, -$self->{w}, 0;
2139
2140 ($w, $h) = ($h, $w);
2141 }
2142
2143 glEnable GL_TEXTURE_2D;
2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146 $tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148 glDisable GL_TEXTURE_2D;
2149}
2150
2151#############################################################################
2152
2153package CFClient::UI::VGauge;
2154
2155our @ISA = CFClient::UI::Base::;
2156 2663
2157use List::Util qw(min max); 2664use List::Util qw(min max);
2158 2665
2159use CFClient::OpenGL; 2666use CFPlus::OpenGL;
2160 2667
2161my %tex = ( 2668my %tex = (
2162 food => [ 2669 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2671 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2672 ],
2166 grace => [ 2673 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 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/
2169 ], 2676 ],
2170 hp => [ 2677 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2678 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2679 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2680 ],
2174 mana => [ 2681 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2682 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 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/
2177 ], 2684 ],
2178); 2685);
2179 2686
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2687# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2747 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2748 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2749
2243 my $h1 = $self->{h} * (1 - $ycut1); 2750 my $h1 = $self->{h} * (1 - $ycut1);
2244 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);
2245 2755
2246 glEnable GL_BLEND; 2756 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2757 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2758 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
… …
2268 2778
2269 if ($t3) { 2779 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2780 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2781 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2782 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2783 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2784 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2785 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2786 glEnd;
2277 } 2787 }
2278 2788
2279 glDisable GL_BLEND; 2789 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2281} 2791}
2282 2792
2283############################################################################# 2793#############################################################################
2284 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
2285package CFClient::UI::Gauge; 2933package CFPlus::UI::Gauge;
2286 2934
2287our @ISA = CFClient::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2288 2936
2289sub new { 2937sub new {
2290 my ($class, %arg) = @_; 2938 my ($class, %arg) = @_;
2291 2939
2292 my $self = $class->SUPER::new ( 2940 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2942 can_hover => 1,
2295 can_events => 1, 2943 can_events => 1,
2296 %arg, 2944 %arg,
2297 ); 2945 );
2298 2946
2299 $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");
2300 $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);
2301 $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");
2302 2950
2303 $self 2951 $self
2304} 2952}
2305 2953
2306sub set_fontsize { 2954sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2975 $self->{value}->set_text ($val);
2328} 2976}
2329 2977
2330############################################################################# 2978#############################################################################
2331 2979
2332package CFClient::UI::Slider; 2980package CFPlus::UI::Slider;
2333 2981
2334use strict; 2982use strict;
2335 2983
2336use CFClient::OpenGL; 2984use CFPlus::OpenGL;
2337 2985
2338our @ISA = CFClient::UI::DrawBG::; 2986our @ISA = CFPlus::UI::DrawBG::;
2339 2987
2340my @tex = 2988my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2989 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2990 qw(s1_slider.png s1_slider_bg.png);
2343 2991
2344sub new { 2992sub new {
2345 my $class = shift; 2993 my $class = shift;
2346 2994
… …
2367 $self->update; 3015 $self->update;
2368 3016
2369 $self 3017 $self
2370} 3018}
2371 3019
2372sub changed { }
2373
2374sub set_range { 3020sub set_range {
2375 my ($self, $range) = @_; 3021 my ($self, $range) = @_;
2376 3022
2377 ($range, $self->{range}) = ($self->{range}, $range); 3023 ($range, $self->{range}) = ($self->{range}, $range);
2378 3024
… …
2398 if $unit; 3044 if $unit;
2399 3045
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3046 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 3047
2402 if ($value != $old_value) { 3048 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 3049 $self->emit (changed => $value);
2404 $self->update; 3050 $self->update;
2405 } 3051 }
2406} 3052}
2407 3053
2408sub size_request { 3054sub size_request {
2409 my ($self) = @_; 3055 my ($self) = @_;
2410 3056
2411 ($self->{req_w}, $self->{req_h}) 3057 ($self->{req_w}, $self->{req_h})
2412} 3058}
2413 3059
2414sub button_down { 3060sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 3061 my ($self, $ev, $x, $y) = @_;
2416 3062
2417 $self->SUPER::button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 3064
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 3066
2421 $self->mouse_motion ($ev, $x, $y) 3067 $self->invoke_mouse_motion ($ev, $x, $y);
2422}
2423 3068
3069 1
3070}
3071
2424sub mouse_motion { 3072sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2426 3074
2427 if ($GRAB == $self) { 3075 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3076 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 3077
… …
2433 3081
2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3082 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else { 3083 } else {
2436 return 0; 3084 return 0;
2437 } 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);
2438 3098
2439 1 3099 1
2440} 3100}
2441 3101
2442sub update { 3102sub update {
… …
2493 glDisable GL_TEXTURE_2D; 3153 glDisable GL_TEXTURE_2D;
2494} 3154}
2495 3155
2496############################################################################# 3156#############################################################################
2497 3157
2498package CFClient::UI::ValSlider; 3158package CFPlus::UI::ValSlider;
2499 3159
2500our @ISA = CFClient::UI::HBox::; 3160our @ISA = CFPlus::UI::HBox::;
2501 3161
2502sub new { 3162sub new {
2503 my ($class, %arg) = @_; 3163 my ($class, %arg) = @_;
2504 3164
2505 my $range = delete $arg{range}; 3165 my $range = delete $arg{range};
2506 3166
2507 my $self = $class->SUPER::new ( 3167 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3168 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3169 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 3170 to_value => sub { shift },
2511 from_value => sub { shift }, 3171 from_value => sub { shift },
2512 %arg, 3172 %arg,
2513 ); 3173 );
2514 3174
… …
2534sub set_range { shift->{slider}->set_range (@_) } 3194sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 3195sub set_value { shift->{slider}->set_value (@_) }
2536 3196
2537############################################################################# 3197#############################################################################
2538 3198
2539package CFClient::UI::TextScroller; 3199package CFPlus::UI::TextScroller;
2540 3200
2541our @ISA = CFClient::UI::HBox::; 3201our @ISA = CFPlus::UI::HBox::;
2542 3202
2543use CFClient::OpenGL; 3203use CFPlus::OpenGL;
2544 3204
2545sub new { 3205sub new {
2546 my $class = shift; 3206 my $class = shift;
2547 3207
2548 my $self = $class->SUPER::new ( 3208 my $self = $class->SUPER::new (
2549 fontsize => 1, 3209 fontsize => 1,
2550 can_events => 0, 3210 can_events => 1,
2551 indent => 0, 3211 indent => 0,
2552 #font => default_font 3212 #font => default_font
2553 @_, 3213 @_,
2554 3214
2555 layout => (new CFClient::Layout 1), 3215 layout => (new CFPlus::Layout),
2556 par => [], 3216 par => [],
3217 max_par => 0,
2557 height => 0, 3218 height => 0,
2558 children => [ 3219 children => [
2559 (new CFClient::UI::Empty expand => 1), 3220 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 3221 (new CFPlus::UI::Slider vertical => 1),
2561 ], 3222 ],
2562 ); 3223 );
2563 3224
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 3225 $self->{children}[1]->connect (changed => sub { $self->update });
2565 3226
… …
2571 3232
2572 $self->{fontsize} = $fontsize; 3233 $self->{fontsize} = $fontsize;
2573 $self->reflow; 3234 $self->reflow;
2574} 3235}
2575 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
2576sub size_allocate { 3246sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 3247 my ($self, $w, $h) = @_;
2578 3248
2579 $self->SUPER::size_allocate ($w, $h); 3249 my ($empty, $slider, @other) = @{ $self->{children} };
3250 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 3251
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3252 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3253 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 3254 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3255 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 3256
2586 $self->reflow; 3257 $self->reflow;
2587}
2588 3258
2589sub text_size { 3259 local $self->{children} = [$empty, $slider];
3260 $self->SUPER::invoke_size_allocate ($w, $h)
3261}
3262
3263sub invoke_mouse_wheel {
2590 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) = @_;
2591 3275
2592 my $layout = $self->{layout}; 3276 my $layout = $self->{layout};
2593 3277
3278 $layout->set_font ($self->{font}) if $self->{font};
3279 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3280 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 3281 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3282 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $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}}
2598 3289 );
3290
2599 $layout->size 3291 $layout
2600} 3292}
2601 3293
2602sub reflow { 3294sub reflow {
2603 my ($self) = @_; 3295 my ($self) = @_;
2604 3296
… …
2611 3303
2612 # todo: base offset on lines or so, not on pixels 3304 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 3305 $self->{children}[1]->set_value ($offset);
2614} 3306}
2615 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
2616sub clear { 3323sub clear {
2617 my ($self) = @_; 3324 my ($self) = @_;
3325
3326 my (undef, undef, @other) = @{ $self->{children} };
3327 $self->remove ($_) for @other;
2618 3328
2619 $self->{par} = []; 3329 $self->{par} = [];
2620 $self->{height} = 0; 3330 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3331 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 3332}
2623 3333
2624sub add_paragraph { 3334sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 3335 my $self = shift;
2626 3336
2627 for my $line (split /\n/, $text) { 3337 for my $para (@_) {
2628 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
2629 $self->{height} += $h; 3389 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3390 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 3391
2633 $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 }
2634} 3398}
2635 3399
2636sub update { 3400sub update {
2637 my ($self) = @_; 3401 my ($self) = @_;
2638 3402
… …
2641 return unless $self->{h} > 0; 3405 return unless $self->{h} > 0;
2642 3406
2643 delete $self->{texture}; 3407 delete $self->{texture};
2644 3408
2645 $ROOT->on_post_alloc ($self => sub { 3409 $ROOT->on_post_alloc ($self => sub {
3410 $self->force_uptodate;
3411
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3412 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3413
2648 if (delete $self->{need_reflow}) {
2649 my $height = 0;
2650
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2667
2668 $self->{height} = $height;
2669
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2671
2672 delete $self->{texture};
2673 }
2674
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3414 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3415 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3416 glClear GL_COLOR_BUFFER_BIT;
2678 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;
2679 my $top = int $self->{children}[1]{range}[0]; 3426 my $top = int $self->{children}[1]{range}[0];
2680 3427
2681 my $y0 = $top; 3428 my $y0 = $top;
2682 my $y1 = $top + $H; 3429 my $y1 = $top + $H;
2683 3430
2684 my $y = 0;
2685
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 3431 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3432 my $h = $para->{h};
3433 my $y = $para->{y};
2696 3434
2697 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3436 my $layout = $self->get_layout ($para);
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 3437
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
2704 3440
2705 glRasterPos $par->[3], $y - $y0; 3441 if (my @w = @{ $para->{widget} }) {
2706 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 }
2707 } 3453 }
2708 3454
2709 $y += $h; 3455 $paridx++;
3456 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3457 }
2711 3458
2712 glDisable GL_BLEND; 3459 $self->{top_paragraph} = $top_paragraph;
2713 }; 3460 };
2714 }); 3461 });
3462}
3463
3464sub reconfigure {
3465 my ($self) = @_;
3466
3467 $self->SUPER::reconfigure;
3468
3469 $_->{w} = 1e10 for @{ $self->{par} };
3470 $self->reflow;
2715} 3471}
2716 3472
2717sub _draw { 3473sub _draw {
2718 my ($self) = @_; 3474 my ($self) = @_;
2719 3475
… …
2722 glColor 0, 0, 0, 1; 3478 glColor 0, 0, 0, 1;
2723 $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});
2724 glDisable GL_TEXTURE_2D; 3480 glDisable GL_TEXTURE_2D;
2725 3481
2726 $self->{children}[1]->draw; 3482 $self->{children}[1]->draw;
2727
2728} 3483}
2729 3484
2730############################################################################# 3485#############################################################################
2731 3486
2732package CFClient::UI::Animator; 3487package CFPlus::UI::Animator;
2733 3488
2734use CFClient::OpenGL; 3489use CFPlus::OpenGL;
2735 3490
2736our @ISA = CFClient::UI::Bin::; 3491our @ISA = CFPlus::UI::Bin::;
2737 3492
2738sub moveto { 3493sub moveto {
2739 my ($self, $x, $y) = @_; 3494 my ($self, $x, $y) = @_;
2740 3495
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3496 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3524 glPopMatrix;
2770} 3525}
2771 3526
2772############################################################################# 3527#############################################################################
2773 3528
2774package CFClient::UI::Flopper; 3529package CFPlus::UI::Flopper;
2775 3530
2776our @ISA = CFClient::UI::Button::; 3531our @ISA = CFPlus::UI::Button::;
2777 3532
2778sub new { 3533sub new {
2779 my $class = shift; 3534 my $class = shift;
2780 3535
2781 my $self = $class->SUPER::new ( 3536 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3548 $self->{other}->toggle_visibility;
2794} 3549}
2795 3550
2796############################################################################# 3551#############################################################################
2797 3552
2798package CFClient::UI::Tooltip; 3553package CFPlus::UI::Tooltip;
2799 3554
2800our @ISA = CFClient::UI::Bin::; 3555our @ISA = CFPlus::UI::Bin::;
2801 3556
2802use CFClient::OpenGL; 3557use CFPlus::OpenGL;
2803 3558
2804sub new { 3559sub new {
2805 my $class = shift; 3560 my $class = shift;
2806 3561
2807 $class->SUPER::new ( 3562 $class->SUPER::new (
… …
2811} 3566}
2812 3567
2813sub set_tooltip_from { 3568sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
2815 3570
2816 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 =~ /^#(.*)$/;
2817 3576
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
2823 } 3582 }
2824 3583
2825 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
2827 3586
2828 $self->add (new CFClient::UI::Label 3587 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 3588 markup => $tip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3590 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3591 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3592 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3594 );
2836} 3595}
2837 3596
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3600 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3601
2843 ($w + 4, $h + 4) 3602 ($w + 4, $h + 4)
2844} 3603}
2845 3604
2846sub size_allocate { 3605sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3606 my ($self, $w, $h) = @_;
2848 3607
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3608 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3609}
2851 3610
2852sub visibility_change { 3611sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3612 my ($self, $visible) = @_;
2854 3613
2855 return unless $visible; 3614 return unless $visible;
2856 3615
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3616 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3617 my $widget = $self->{owner}
2859 or return; 3618 or return;
2860 3619
3620 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3621 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3622
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3623 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3624 if $x + $self->{w} > $self->{root}{w};
2865 3625
2866 $self->move_abs ($x, $y); 3626 $self->move_abs ($x, $y);
3627 } else {
3628 $self->hide;
3629 }
2867 }); 3630 });
2868} 3631}
2869 3632
2870sub _draw { 3633sub _draw {
2871 my ($self) = @_; 3634 my ($self) = @_;
2872 3635
2873 glTranslate 0.375, 0.375;
2874
2875 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
2876 3637
2877 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
2878 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
2879 glVertex 0 , 0;
2880 glVertex 0 , $h;
2881 glVertex $w, $h;
2882 glVertex $w, 0;
2883 glEnd;
2884 3640
2885 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
2886 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
2887 glVertex 0 , 0;
2888 glVertex 0 , $h;
2889 glVertex $w, $h;
2890 glVertex $w, 0;
2891 glEnd;
2892 3643
2893 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
2894 3645
2895 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
2896} 3647}
2897 3648
2898############################################################################# 3649#############################################################################
2899 3650
2900package CFClient::UI::Face; 3651package CFPlus::UI::Face;
2901 3652
2902our @ISA = CFClient::UI::Base::; 3653our @ISA = CFPlus::UI::DrawBG::;
2903 3654
2904use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2905 3656
2906sub new { 3657sub new {
2907 my $class = shift; 3658 my $class = shift;
2908 3659
2909 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3661 size_w => 32,
3662 size_h => 8,
2910 aspect => 1, 3663 aspect => 1,
2911 can_events => 0, 3664 can_events => 0,
2912 @_, 3665 @_,
2913 ); 3666 );
2914 3667
2915 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
2917 3670
3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2918 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1, 3674 parked => 1,
2921 interval => $self->{animspeed},
2922 cb => sub { 3675 cb => sub {
3676 return unless $::CONN;
3677
3678 my $w = $widget
3679 or return;
3680
2923 ++$widget->{frame}; 3681 ++$w->{frame};
3682 $w->update_face;
3683
3684 # somehow, $widget can go away
2924 $widget->update; 3685 $w->update;
3686 $w->update_timer;
2925 }, 3687 },
2926 ); 3688 );
3689
3690 $self->update_face;
3691 $self->update_timer;
2927 } 3692 }
2928 3693
2929 $self 3694 $self
2930} 3695}
2931 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
2932sub size_request { 3733sub size_request {
2933 (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)
2934} 3751}
2935 3752
2936sub update { 3753sub update {
2937 my ($self) = @_; 3754 my ($self) = @_;
2938 3755
2939 return unless $self->{visible}; 3756 return unless $self->{visible};
2940 3757
2941 $self->SUPER::update; 3758 $self->SUPER::update;
2942} 3759}
2943 3760
3761sub invoke_visibility_change {
3762 my ($self) = @_;
3763
3764 $self->update_timer;
3765
3766 0
3767}
3768
2944sub _draw { 3769sub _draw {
2945 my ($self) = @_; 3770 my ($self) = @_;
2946 3771
2947 return unless $::CONN; 3772 $self->SUPER::_draw;
2948 3773
2949 my $face; 3774 if (my $tex = $self->{tex}) {
2950
2951 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}];
2953
2954 $face = $anim->[ $self->{frame} % @$anim ]
2955 if $anim && @$anim;
2956 }
2957
2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2959
2960 if ($tex) {
2961 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963 glColor 0, 0, 0, 1; 3777 glColor 0, 0, 0, 1;
2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2965 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
… …
2967} 3781}
2968 3782
2969sub destroy { 3783sub destroy {
2970 my ($self) = @_; 3784 my ($self) = @_;
2971 3785
2972 $self->{timer}->cancel 3786 (delete $self->{timer})->cancel
2973 if $self->{timer}; 3787 if $self->{timer};
2974 3788
2975 $self->SUPER::destroy; 3789 $self->SUPER::destroy;
2976} 3790}
2977 3791
2978############################################################################# 3792#############################################################################
2979 3793
2980package CFClient::UI::Buttonbar; 3794package CFPlus::UI::Buttonbar;
2981 3795
2982our @ISA = CFClient::UI::HBox::; 3796our @ISA = CFPlus::UI::HBox::;
2983 3797
2984# TODO: should actualyl wrap buttons and other goodies. 3798# TODO: should actually wrap buttons and other goodies.
2985 3799
2986############################################################################# 3800#############################################################################
2987 3801
2988package CFClient::UI::Menu; 3802package CFPlus::UI::Menu;
2989 3803
2990our @ISA = CFClient::UI::FancyFrame::; 3804our @ISA = CFPlus::UI::Toplevel::;
2991 3805
2992use CFClient::OpenGL; 3806use CFPlus::OpenGL;
2993 3807
2994sub new { 3808sub new {
2995 my $class = shift; 3809 my $class = shift;
2996 3810
2997 my $self = $class->SUPER::new ( 3811 my $self = $class->SUPER::new (
2998 items => [], 3812 items => [],
2999 z => 100, 3813 z => 100,
3000 @_, 3814 @_,
3001 ); 3815 );
3002 3816
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3817 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3818
3005 for my $item (@{ $self->{items} }) { 3819 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3820 my ($widget, $cb, $tooltip) = @$item;
3007 3821
3008 # handle various types of items, only text for now 3822 # handle various types of items, only text for now
3009 if (!ref $widget) { 3823 if (!ref $widget) {
3824 if ($widget =~ /\t/) {
3825 my ($left, $right) = split /\t/, $widget, 2;
3826
3010 $widget = new CFClient::UI::Label 3827 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3828 can_hover => 1,
3012 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,
3013 markup => $widget, 3841 markup => $widget,
3014 tooltip => $tooltip 3842 tooltip => $tooltip;
3843 }
3015 } 3844 }
3016 3845
3017 $self->{item}{$widget} = $item; 3846 $self->{item}{$widget} = $item;
3018 3847
3019 $self->{vbox}->add ($widget); 3848 $self->{vbox}->add ($widget);
… …
3024 3853
3025# 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)
3026sub popup { 3855sub popup {
3027 my ($self, $ev) = @_; 3856 my ($self, $ev) = @_;
3028 3857
3029 $self->_emit ("popdown"); 3858 $self->emit ("popdown");
3030 3859
3031 # maybe save $GRAB? must be careful about events... 3860 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3861 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3862 $self->{button} = $ev->{button};
3034 3863
3035 $self->show; 3864 $self->show;
3036 $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);
3037} 3866}
3038 3867
3039sub mouse_motion { 3868sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3869 my ($self, $ev, $x, $y) = @_;
3041 3870
3042 # TODO: should use vbox->find_widget or so 3871 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3872 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3873 $self->{hover} = $self->{item}{$HOVER};
3045 3874
3046 0 3875 0
3047} 3876}
3048 3877
3049sub button_up { 3878sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3879 my ($self, $ev, $x, $y) = @_;
3051 3880
3052 if ($ev->{button} == $self->{button}) { 3881 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3882 undef $GRAB;
3054 $self->hide; 3883 $self->hide;
3055 3884
3056 $self->_emit ("popdown"); 3885 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3886 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3887 } else {
3059 return 0 3888 return 0
3060 } 3889 }
3061 3890
3062 1 3891 1
3063} 3892}
3064 3893
3065############################################################################# 3894#############################################################################
3066 3895
3067package CFClient::UI::Multiplexer; 3896package CFPlus::UI::Multiplexer;
3068 3897
3069our @ISA = CFClient::UI::Container::; 3898our @ISA = CFPlus::UI::Container::;
3070 3899
3071sub new { 3900sub new {
3072 my $class = shift; 3901 my $class = shift;
3073 3902
3074 my $self = $class->SUPER::new ( 3903 my $self = $class->SUPER::new (
… …
3088 3917
3089 $self->{current} = $self->{children}[0] 3918 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3919 if @{ $self->{children} };
3091} 3920}
3092 3921
3922sub get_current_page {
3923 my ($self) = @_;
3924
3925 $self->{current}
3926}
3927
3093sub set_current_page { 3928sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3929 my ($self, $page_or_widget) = @_;
3095 3930
3096 my $widget = ref $page_or_widget 3931 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3932 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3933 : $self->{children}[$page_or_widget];
3099 3934
3100 $self->{current} = $widget; 3935 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3936 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3937
3103 $self->_emit (page_changed => $self->{current}); 3938 $self->emit (page_changed => $self->{current});
3104 3939
3105 $self->realloc; 3940 $self->realloc;
3106} 3941}
3107 3942
3108sub visible_children { 3943sub visible_children {
… …
3113 my ($self) = @_; 3948 my ($self) = @_;
3114 3949
3115 $self->{current}->size_request 3950 $self->{current}->size_request
3116} 3951}
3117 3952
3118sub size_allocate { 3953sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3954 my ($self, $w, $h) = @_;
3120 3955
3121 $self->{current}->configure (0, 0, $w, $h); 3956 $self->{current}->configure (0, 0, $w, $h);
3957
3958 1
3122} 3959}
3123 3960
3124sub _draw { 3961sub _draw {
3125 my ($self) = @_; 3962 my ($self) = @_;
3126 3963
3127 $self->{current}->draw; 3964 $self->{current}->draw;
3128} 3965}
3129 3966
3130############################################################################# 3967#############################################################################
3131 3968
3132package CFClient::UI::Notebook; 3969package CFPlus::UI::Notebook;
3133 3970
3971use CFPlus::OpenGL;
3972
3134our @ISA = CFClient::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3135 3974
3136sub new { 3975sub new {
3137 my $class = shift; 3976 my $class = shift;
3138 3977
3139 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3142 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3143 @_, 3983 @_,
3144 ); 3984 );
3145 3985
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148 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
3149 $self 4023 $self
3150} 4024}
3151 4025
3152sub 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 {
3153 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3154 4045
3155 Scalar::Util::weaken $self; 4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
3156 4048
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget); 4049 $self->add ($widget);
4050}
4051
4052sub get_current_page {
4053 my ($self) = @_;
4054
4055 $self->{multiplexer}->get_current_page
3164} 4056}
3165 4057
3166sub set_current_page { 4058sub set_current_page {
3167 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3168 4060
3169 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3170 $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 }
3171} 4083}
3172 4084
3173############################################################################# 4085#############################################################################
3174 4086
3175package CFClient::UI::Combobox; 4087package CFPlus::UI::Selector;
3176 4088
3177use utf8; 4089use utf8;
3178 4090
3179our @ISA = CFClient::UI::Button::; 4091our @ISA = CFPlus::UI::Button::;
3180 4092
3181sub new { 4093sub new {
3182 my $class = shift; 4094 my $class = shift;
3183 4095
3184 my $self = $class->SUPER::new ( 4096 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 4102 $self->_set_value ($self->{value});
3191 4103
3192 $self 4104 $self
3193} 4105}
3194 4106
3195sub button_down { 4107sub invoke_button_down {
3196 my ($self, $ev) = @_; 4108 my ($self, $ev) = @_;
3197 4109
3198 my @menu_items; 4110 my @menu_items;
3199 4111
3200 for (@{ $self->{options} }) { 4112 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 4113 my ($value, $title, $tooltip) = @$_;
3202 4114
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4115 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 4116 }
3205 4117
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4118 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 4119}
3208 4120
3209sub _set_value { 4121sub _set_value {
3210 my ($self, $value) = @_; 4122 my ($self, $value) = @_;
3211 4123
… …
3221 my ($self, $value) = @_; 4133 my ($self, $value) = @_;
3222 4134
3223 return unless $self->{value} ne $value; 4135 return unless $self->{value} ne $value;
3224 4136
3225 $self->_set_value ($value); 4137 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 4138 $self->emit (changed => $value);
3227} 4139}
3228 4140
3229############################################################################# 4141#############################################################################
3230 4142
3231package CFClient::UI::Statusbox; 4143package CFPlus::UI::Statusbox;
3232 4144
3233our @ISA = CFClient::UI::VBox::; 4145our @ISA = CFPlus::UI::VBox::;
3234 4146
3235sub new { 4147sub new {
3236 my $class = shift; 4148 my $class = shift;
3237 4149
3238 my $self = $class->SUPER::new ( 4150 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 4151 fontsize => 0.8,
3240 @_, 4152 @_,
3241 ); 4153 );
3242 4154
3243 Scalar::Util::weaken (my $this = $self); 4155 CFPlus::weaken (my $this = $self);
3244 4156
3245 $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 });
3246 4158
3247 $self 4159 $self
3248} 4160}
… …
3250sub reorder { 4162sub reorder {
3251 my ($self) = @_; 4163 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 4164 my $NOW = Time::HiRes::time;
3253 4165
3254 # freeze display when hovering over any label 4166 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 4167 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4168 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 4169 values %{ $self->{item} };
3258 4170
3259 while (my ($k, $v) = each %{ $self->{item} }) { 4171 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4172 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 4173 }
… …
3282 for ($short) { 4194 for ($short) {
3283 s/^\s+//; 4195 s/^\s+//;
3284 s/\s+/ /g; 4196 s/\s+/ /g;
3285 } 4197 }
3286 4198
3287 new CFClient::UI::Label 4199 new CFPlus::UI::Label
3288 markup => $short, 4200 markup => $short,
3289 tooltip => $item->{tooltip}, 4201 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 4202 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 4203 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 4204 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 4258 count => 1,
3347 %arg, 4259 %arg,
3348 }; 4260 };
3349 } 4261 }
3350 4262
4263 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 4264 $self->reorder;
4265 });
3352} 4266}
3353 4267
3354sub reconfigure { 4268sub reconfigure {
3355 my ($self) = @_; 4269 my ($self) = @_;
3356 4270
… …
3369 $self->SUPER::destroy; 4283 $self->SUPER::destroy;
3370} 4284}
3371 4285
3372############################################################################# 4286#############################################################################
3373 4287
3374package CFClient::UI::Inventory;
3375
3376our @ISA = CFClient::UI::ScrolledWindow::;
3377
3378sub new {
3379 my $class = shift;
3380
3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root; 4288package CFPlus::UI::Root;
3737 4289
3738our @ISA = CFClient::UI::Container::; 4290our @ISA = CFPlus::UI::Container::;
3739 4291
3740use List::Util qw(min max); 4292use List::Util qw(min max);
3741 4293
3742use CFClient::OpenGL; 4294use CFPlus::OpenGL;
3743 4295
3744sub new { 4296sub new {
3745 my $class = shift; 4297 my $class = shift;
3746 4298
3747 my $self = $class->SUPER::new ( 4299 my $self = $class->SUPER::new (
3748 visible => 1, 4300 visible => 1,
3749 @_, 4301 @_,
3750 ); 4302 );
3751 4303
3752 Scalar::Util::weaken ($self->{root} = $self); 4304 CFPlus::weaken ($self->{root} = $self);
3753 4305
3754 $self 4306 $self
3755} 4307}
3756 4308
3757sub size_request { 4309sub size_request {
… …
3772 $coord = $max - $size if $coord > $max - $size; 4324 $coord = $max - $size if $coord > $max - $size;
3773 4325
3774 int $coord + 0.5 4326 int $coord + 0.5
3775} 4327}
3776 4328
3777sub size_allocate { 4329sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 4330 my ($self, $w, $h) = @_;
3779 4331
3780 for my $child ($self->children) { 4332 for my $child ($self->children) {
3781 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)};
3782 4334
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 4338 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 4339 $Y = _to_pixel $Y, $H, $self->{h};
3788 4340
3789 $child->configure ($X, $Y, $W, $H); 4341 $child->configure ($X, $Y, $W, $H);
3790 } 4342 }
4343
4344 1
3791} 4345}
3792 4346
3793sub coord2local { 4347sub coord2local {
3794 my ($self, $x, $y) = @_; 4348 my ($self, $x, $y) = @_;
3795 4349
… …
3803} 4357}
3804 4358
3805sub update { 4359sub update {
3806 my ($self) = @_; 4360 my ($self) = @_;
3807 4361
3808 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
3809} 4363}
3810 4364
3811sub add { 4365sub add {
3812 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
3813 4367
… …
3850 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
3851 $_->() 4405 $_->()
3852 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
3853 } 4407 }
3854 4408
3855 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
3856 my %queue; 4410 my %queue;
3857 my @queue; 4411 my @queue;
3858 my $widget; 4412 my $widget;
3859 4413
3860 outer: 4414 outer:
… …
3907 } 4461 }
3908 } 4462 }
3909 4463
3910 delete $self->{realloc}{$widget+0}; 4464 delete $self->{realloc}{$widget+0};
3911 } 4465 }
3912 }
3913 4466
3914 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
3915 my @queue = sort { $b->{visible} <=> $a->{visible} } 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
3916 values %$size_alloc; 4469 values %$size_alloc;
3917 4470
3918 while () { 4471 while () {
3919 my $widget = pop @queue || last; 4472 my $widget = pop @queue || last;
3920 4473
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 4475
3923 $w = 0 if $w < 0; 4476 $w = max $widget->{min_w}, $w;
3924 $h = 0 if $h < 0; 4477 $h = max $widget->{min_h}, $h;
3925 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
3926 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
3928 4487
3929 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}) {
3930 $widget->{old_w} = $widget->{w}; 4489 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h}; 4490 $widget->{old_h} = $widget->{h};
3932 4491
3933 $widget->{w} = $w; 4492 $widget->{w} = $w;
3934 $widget->{h} = $h; 4493 $widget->{h} = $h;
3935 4494
3936 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
3937 } 4497 }
3938 } 4498 }
3939 } 4499 }
3940 4500
3941 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {
3942 $_->() 4502 $_->()
3943 for values %{delete $self->{post_alloc_hook}}; 4503 for values %{delete $self->{post_alloc_hook}};
3944 } 4504 }
3945
3946 4505
3947 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4506 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4507 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3949 glClear GL_COLOR_BUFFER_BIT; 4508 glClear GL_COLOR_BUFFER_BIT;
3950 4509
… …
3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4512 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954 glMatrixMode GL_MODELVIEW; 4513 glMatrixMode GL_MODELVIEW;
3955 glLoadIdentity; 4514 glLoadIdentity;
3956 4515
3957 { 4516 {
3958 package CFClient::UI::Base; 4517 package CFPlus::UI::Base;
3959 4518
3960 ($draw_x, $draw_y, $draw_w, $draw_h) = 4519 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h}); 4520 (0, 0, $self->{w}, $self->{h});
3962 }
3963 4521
3964 $self->_draw; 4522 $self->_draw;
4523 }
3965} 4524}
3966 4525
3967############################################################################# 4526#############################################################################
3968 4527
3969package CFClient::UI; 4528package CFPlus::UI;
3970 4529
3971$ROOT = new CFClient::UI::Root; 4530$ROOT = new CFPlus::UI::Root;
3972$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4531$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973 4532
39741 45331
3975 4534

Diff Legend

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