ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 2007 UTC

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

Diff Legend

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