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

Diff Legend

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