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

Diff Legend

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