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

Diff Legend

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