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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.438 by root, Sat Sep 1 07:22:21 2007 UTC

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

Diff Legend

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