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.293 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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
912 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
913 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
914 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
915 $self->update; 995 $self->update;
916} 996}
917 997
918# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local { 999sub coord2local {
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1019 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1021 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1023 }
944} 1024}
945 1025
946sub _render { 1026sub _render {
947 my ($self) = @_; 1027 my ($self) = @_;
948 1028
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 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}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1031
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1033
954 $self->SUPER::_render; 1034 $self->SUPER::_render;
955} 1035}
956 1036
957############################################################################# 1037#############################################################################
958 1038
959package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
960 1040
961our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
962 1042
963sub new { 1043sub new {
964 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
965 1045
966 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
967 1047
968 my $self; 1048 my $self;
969 1049
970 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1060 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1062 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1065 },
976 ; 1066 ;
977 1067
978 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
980 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
981 %arg, 1076 %arg,
982 ); 1077 );
983 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
985 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
986 1095
987 $self 1096 $self
988} 1097}
1098
1099#TODO# update range on size_allocate depending on child
989 1100
990sub add { 1101sub add {
991 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
992 1103
993 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
994} 1105}
995 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
996sub update { 1131sub update {
997 my ($self) = @_; 1132 my ($self) = @_;
998 1133
999 $self->SUPER::update; 1134 $self->SUPER::update;
1000 1135 $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} 1136}
1005 1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
1006sub size_allocate { 1191sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1008 1193
1194 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1195 $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} 1196}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1197
1018############################################################################# 1198#############################################################################
1019 1199
1020package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1021 1201
1022our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1023 1203
1024use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1025 1205
1026sub new { 1206sub new {
1027 my $class = shift; 1207 my $class = shift;
1028 1208
1029 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1056} 1236}
1057 1237
1058############################################################################# 1238#############################################################################
1059 1239
1060package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1061 1241
1062our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1063 1243
1064use CFClient::OpenGL; 1244use 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 1245
1074sub new { 1246sub new {
1075 my ($class, %arg) = @_; 1247 my ($class, %arg) = @_;
1076 1248
1077 my $title = delete $arg{title}; 1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1346my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1;
1349
1350my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354sub new {
1355 my ($class, %arg) = @_;
1078 1356
1079 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1360 border => 0.6,
1083 can_events => 1, 1361 can_events => 1,
1084 min_w => 16, 1362 min_w => 64,
1085 min_h => 16, 1363 min_h => 32,
1086 %arg, 1364 %arg,
1087 ); 1365 );
1088 1366
1089 $self->{title} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1368 align => 0,
1091 valign => 1, 1369 valign => 1,
1092 text => $title, 1370 text => $self->{title},
1093 fontsize => $self->{border} 1371 fontsize => $self->{border},
1094 if defined $title; 1372 if exists $self->{title};
1373
1374 if ($self->{has_close_button}) {
1375 $self->{close_button} =
1376 new CFPlus::UI::ImageButton
1377 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") };
1379
1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1381 }
1095 1382
1096 $self 1383 $self
1097} 1384}
1098 1385
1099sub add { 1386sub add {
1100 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1101 1388
1102 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1392}
1105 1393
1106sub border { 1394sub border {
1107 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1108} 1396}
1109 1397
1110sub size_request { 1398sub size_request {
1111 my ($self) = @_; 1399 my ($self) = @_;
1112 1400
1113 $self->{title}->size_request 1401 $self->{title_widget}->size_request
1114 if $self->{title}; 1402 if $self->{title_widget};
1403
1404 $self->{close_button}->size_request
1405 if $self->{close_button};
1115 1406
1116 my ($w, $h) = $self->SUPER::size_request; 1407 my ($w, $h) = $self->SUPER::size_request;
1117 1408
1118 ( 1409 (
1119 $w + $self->border * 2, 1410 $w + $self->border * 2,
1120 $h + $self->border * 2, 1411 $h + $self->border * 2,
1121 ) 1412 )
1122} 1413}
1123 1414
1124sub size_allocate { 1415sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
1126 1417
1127 if ($self->{title}) { 1418 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1419 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1420 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1421 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1422 }
1132 1423
1133 my $border = $self->border; 1424 my $border = $self->border;
1134 1425
1135 $h -= List::Util::max 0, $border * 2; 1426 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1427 $w -= List::Util::max 0, $border * 2;
1428
1429 $self->child->configure ($border, $border, $w, $h);
1430
1431 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1432 if $self->{close_button};
1433
1434 1
1435}
1436
1437sub invoke_delete {
1438 my ($self) = @_;
1439
1440 $self->hide;
1137 1441
1138 $self->child->configure ($border, $border, $w, $h); 1442 1
1139} 1443}
1140 1444
1141sub button_down { 1445sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
1143 1447
1144 my ($w, $h) = @$self{qw(w h)}; 1448 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1449 my $border = $self->border;
1146 1450
… …
1177 1481
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1482 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1483
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1484 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1485 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1486 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1487 };
1184 } else { 1488 } else {
1185 return 0; 1489 return 0;
1186 } 1490 }
1187 1491
1188 1 1492 1
1189} 1493}
1190 1494
1191sub button_up { 1495sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1496 my ($self, $ev, $x, $y) = @_;
1193 1497
1194 !!delete $self->{motion} 1498 ! ! delete $self->{motion}
1195} 1499}
1196 1500
1197sub mouse_motion { 1501sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1199 1503
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1505
1202 !!$self->{motion} 1506 ! ! $self->{motion}
1507}
1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1203} 1515}
1204 1516
1205sub _draw { 1517sub _draw {
1206 my ($self) = @_; 1518 my ($self) = @_;
1207 1519
… …
1233 1545
1234 glDisable GL_TEXTURE_2D; 1546 glDisable GL_TEXTURE_2D;
1235 1547
1236 $child->draw; 1548 $child->draw;
1237 1549
1238 if ($self->{title}) { 1550 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1551 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1552 $self->{title_widget}->_draw;
1553
1554 glTranslate 0, - ($border - $self->{h});
1241 } 1555 }
1556
1557 $self->{close_button}->draw
1558 if $self->{close_button};
1242} 1559}
1243 1560
1244############################################################################# 1561#############################################################################
1245 1562
1246package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1247 1564
1248our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1249 1566
1250use List::Util qw(max sum); 1567use List::Util qw(max sum);
1251 1568
1252use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1253 1570
1254sub new { 1571sub new {
1255 my $class = shift; 1572 my $class = shift;
1256 1573
1257 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1258 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1259 @_, 1578 @_,
1260 ) 1579 )
1261} 1580}
1262 1581
1263sub children { 1582sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1584}
1266 1585
1586# TODO: store row/col info in child widget and use standard add/del
1267sub add { 1587sub add {
1268 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1269 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1592 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1272 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1598 $self->realloc;
1599}
1600
1601sub remove {
1602 my ($self, $child) = @_;
1603
1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1274} 1609}
1275 1610
1276# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1612sub clear {
1278 my ($self) = @_; 1613 my ($self) = @_;
… …
1319 (sum @$ws), 1654 (sum @$ws),
1320 (sum @$hs), 1655 (sum @$hs),
1321 ) 1656 )
1322} 1657}
1323 1658
1324sub size_allocate { 1659sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1660 my ($self, $w, $h) = @_;
1326 1661
1327 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1328 1663
1329 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1331 1666
1332 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1336 1671
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1673
1341 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1342 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1343 1683
1344 my $y; 1684 my $y;
1345 1685
1346 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1361 } 1701 }
1362 1702
1363 $y += $row_h; 1703 $y += $row_h;
1364 } 1704 }
1365 1705
1706 1
1366} 1707}
1367 1708
1368sub find_widget { 1709sub find_widget {
1369 my ($self, $x, $y) = @_; 1710 my ($self, $x, $y) = @_;
1370 1711
… …
1389 } 1730 }
1390} 1731}
1391 1732
1392############################################################################# 1733#############################################################################
1393 1734
1394package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1395 1736
1737use List::Util qw(min max);
1738
1396our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1397 1820
1398sub size_request { 1821sub size_request {
1399 my ($self) = @_; 1822 my ($self) = @_;
1400 1823
1401 $self->{vertical} 1824 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1831 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1832 )
1410} 1833}
1411 1834
1412sub size_allocate { 1835sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1414 1837
1415 my $space = $self->{vertical} ? $h : $w; 1838 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1839 my @children = $self->visible_children;
1417 1840
1418 my @req; 1841 my @req;
1419 1842
1420 if ($self->{homogeneous}) { 1843 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1844 @req = ($space / (@children || 1)) x @children;
1422 } else { 1845 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1846 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1847 my $req = List::Util::sum @req;
1425 1848
1426 if ($req > $space) { 1849 if ($req > $space) {
1427 # ah well, not enough space 1850 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1851 $_ *= $space / $req for @req;
1429 } else { 1852 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1853 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1854
1432 $space = ($space - $req) / $expand; # remaining space to give away 1855 $space = ($space - $req) / $expand; # remaining space to give away
1433 1856
1434 $req[$_] += $space * $children->[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1858 for 0 .. $#children;
1436 } 1859 }
1437 } 1860 }
1438 1861
1439 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1440 1863
1441 my $pos = 0; 1864 my $pos = 0;
1442 for (0 .. $#$children) { 1865 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1868
1446 $pos += $alloc; 1869 $pos += $alloc;
1447 } 1870 }
1448 1871
1449 1 1872 1
1450} 1873}
1451 1874
1452############################################################################# 1875#############################################################################
1453 1876
1454package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1455 1878
1456our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1457 1880
1458sub new { 1881sub new {
1459 my $class = shift; 1882 my $class = shift;
1460 1883
1461 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1464 ) 1887 )
1465} 1888}
1466 1889
1467############################################################################# 1890#############################################################################
1468 1891
1469package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1470 1893
1471our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1472 1895
1473sub new { 1896sub new {
1474 my $class = shift; 1897 my $class = shift;
1475 1898
1476 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1479 ) 1902 )
1480} 1903}
1481 1904
1482############################################################################# 1905#############################################################################
1483 1906
1484package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1485 1908
1486our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1487 1910
1488use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1489 1912
1490sub new { 1913sub new {
1491 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1492 1915
1493 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1919 #active_bg => none
1497 #font => default_font 1920 #font => default_font
1498 #text => initial text 1921 #text => initial text
1499 #markup => initial narkup 1922 #markup => initial narkup
1500 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1501 ellipsise => 3, # end 1925 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1927 fontsize => 1,
1504 align => -1, 1928 align => -1,
1505 valign => -1, 1929 valign => -1,
1506 padding_x => 2, 1930 padding_x => 2,
1507 padding_y => 2, 1931 padding_y => 2,
1508 can_events => 0, 1932 can_events => 0,
1509 %arg 1933 %arg
1510 ); 1934 );
1511 1935
1512 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1939 $self->{template} = $layout;
1516 } 1940 }
1517 1941
1518 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1522 } 1946 }
1523 1947
1524 $self 1948 $self
1525} 1949}
1526 1950
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1951sub update {
1538 my ($self) = @_; 1952 my ($self) = @_;
1539 1953
1540 delete $self->{texture}; 1954 delete $self->{texture};
1541 $self->SUPER::update; 1955 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1553 1967
1554 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1556 1970
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1559 1972
1560 delete $self->{size_req}; 1973 delete $self->{size_req};
1561 $self->realloc; 1974 $self->realloc;
1562 $self->update; 1975 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1570 1983
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1985
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1575 1987
1576 delete $self->{size_req}; 1988 delete $self->{size_req};
1577 $self->realloc; 1989 $self->realloc;
1578 $self->update; 1990 $self->update;
… …
1590 2002
1591 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1592 2004
1593 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 2006 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 2009
1597 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1598 2011
1599 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
… …
1604 }; 2017 };
1605 2018
1606 @{ $self->{size_req} } 2019 @{ $self->{size_req} }
1607} 2020}
1608 2021
2022sub baseline_shift {
2023 $_[0]{layout}->descent
2024}
2025
1609sub size_allocate { 2026sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2027 my ($self, $w, $h) = @_;
1611 2028
1612 delete $self->{ox}; 2029 delete $self->{ox};
1613 2030
1614 delete $self->{texture} 2031 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2032 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2033
2034 1
1616} 2035}
1617 2036
1618sub set_fontsize { 2037sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1620 2039
1621 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1622 delete $self->{texture}; 2042 delete $self->{texture};
1623 2043
1624 $self->realloc; 2044 $self->realloc;
1625} 2045}
1626 2046
1627sub reconfigure { 2047sub reconfigure {
1628 my ($self) = @_; 2048 my ($self) = @_;
1629 2049
1630 delete $self->{size_req}; 2050 delete $self->{size_req};
2051 delete $self->{texture};
1631 2052
1632 $self->SUPER::reconfigure; 2053 $self->SUPER::reconfigure;
1633} 2054}
1634 2055
1635sub _draw { 2056sub _draw {
1636 my ($self) = @_; 2057 my ($self) = @_;
1637 2058
1638 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1639 2060
1640 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 2068
1648 new_from_layout CFClient::Texture $self->{layout} 2069 [$self->{layout}->size]
1649 }; 2070 };
1650 2071
1651 unless (exists $self->{ox}) { 2072 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 2075 : ($self->{w} - $size->[0]) * 0.5);
1655 2076
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 2079 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 2080 };
1660 2081
1661 glEnable GL_TEXTURE_2D; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1662 2084
1663 if ($tex->{format} == GL_ALPHA) { 2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 2086}
1674 2087
1675############################################################################# 2088#############################################################################
1676 2089
1677package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1678 2091
1679our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1680 2093
1681use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1682 2095
1683sub new { 2096sub new {
1684 my $class = shift; 2097 my $class = shift;
1685 2098
1686 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1690 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1691 can_hover => 1, 2104 can_hover => 1,
1692 can_focus => 1, 2105 can_focus => 1,
1693 valign => 0, 2106 valign => 0,
1694 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1695 #text => ... 2109 #text => ...
1696 #hidden => "*", 2110 #hidden => "*",
1697 @_ 2111 @_
1698 ) 2112 )
1699} 2113}
… …
1710 2124
1711 $text =~ s/./*/g if $self->{hidden}; 2125 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 2126 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 2127 delete $self->{size_req};
1714 2128
1715 $self->_emit (changed => $self->{text}); 2129 $self->emit (changed => $self->{text});
1716 2130
1717 $self->realloc; 2131 $self->realloc;
1718 $self->update; 2132 $self->update;
1719} 2133}
1720 2134
… …
1735 my ($w, $h) = $self->SUPER::size_request; 2149 my ($w, $h) = $self->SUPER::size_request;
1736 2150
1737 ($w + 1, $h) # add 1 for cursor 2151 ($w + 1, $h) # add 1 for cursor
1738} 2152}
1739 2153
1740sub key_down { 2154sub invoke_key_down {
1741 my ($self, $ev) = @_; 2155 my ($self, $ev) = @_;
1742 2156
1743 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1746 2160
1747 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1748 2164
1749 if ($uni == 8) { 2165 if ($uni == 8) {
1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1752 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1753 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1754 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1755 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1756 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1757 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1758 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 2189 $self->emit ('escape');
1763 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 2194 } else {
1766 return 0; 2195 return 0;
1767 } 2196 }
1768 2197
1769 $self->_set_text ($text); 2198 $self->_set_text ($text);
1770 2199
1771 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1772 2202
1773 1 2203 1
1774} 2204}
1775 2205
1776sub focus_in { 2206sub invoke_focus_in {
1777 my ($self) = @_; 2207 my ($self) = @_;
1778 2208
1779 $self->{last_activity} = $::NOW; 2209 $self->{last_activity} = $::NOW;
1780 2210
1781 $self->SUPER::focus_in; 2211 $self->SUPER::invoke_focus_in
1782} 2212}
1783 2213
1784sub button_down { 2214sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1786 2216
1787 $self->SUPER::button_down ($ev, $x, $y); 2217 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 2218
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 2220
1791 # byte-index to char-index 2221 # byte-index to char-index
1792 my $text = $self->{text}; 2222 my $text = $self->{text};
1793 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1795 2225
1796 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1797 $self->update; 2227 $self->update;
1798 2228
1799 1 2229 1
1800} 2230}
1801 2231
1802sub mouse_motion { 2232sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2234# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805 2235
1806 0 2236 1
1807} 2237}
1808 2238
1809sub _draw { 2239sub _draw {
1810 my ($self) = @_; 2240 my ($self) = @_;
1811 2241
… …
1838 utf8::encode $text; 2268 utf8::encode $text;
1839 2269
1840 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1841 } 2271 }
1842 2272
1843 glColor @{$self->{fg}};
1844 glBegin GL_LINES; 2273 glBegin GL_LINES;
1845 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1846 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1847 glEnd; 2276 glEnd;
1848 } 2277 }
1849} 2278}
1850 2279
2280#############################################################################
2281
1851package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1852 2283
1853our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1854 2285
1855use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1856 2287
1857sub key_down { 2288sub invoke_key_down {
1858 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1859 2290
1860 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1861 2292
1862 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1863 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1865 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 2299 $self->emit (activate => $txt);
1868 $self->update; 2300 $self->update;
1869 2301
1870 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1873 } 2305 }
1874 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1875 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1877 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 } 2310 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1880 } 2312 }
1881 2313
1882 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1883 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885 2317
1886 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } else { 2320 } else {
1889 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1890 } 2322 }
1891 2323
1892 } else { 2324 } else {
1893 return $self->SUPER::key_down ($ev) 2325 return $self->SUPER::invoke_key_down ($ev)
1894 } 2326 }
1895 2327
1896 1 2328 1
1897} 2329}
1898 2330
1899############################################################################# 2331#############################################################################
1900 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1901package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1902 2373
1903our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1904 2375
1905use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1906 2377
1907my @tex = 2378my @tex =
1908 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1909 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1910 2381
1911sub new { 2382sub new {
1912 my $class = shift; 2383 my $class = shift;
1913 2384
… …
1922 can_events => 1, 2393 can_events => 1,
1923 @_ 2394 @_
1924 ) 2395 )
1925} 2396}
1926 2397
1927sub activate { }
1928
1929sub button_up { 2398sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 2399 my ($self, $ev, $x, $y) = @_;
1931 2400
1932 $self->emit ("activate") 2401 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 2402 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 2403 && $y >= 0 && $y < $self->{h};
… …
1952 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1953} 2422}
1954 2423
1955############################################################################# 2424#############################################################################
1956 2425
1957package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
1958 2427
1959our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
1960 2429
1961my @tex = 2430my @tex =
1962 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964 2433
1965use CFClient::OpenGL; 2434use CFPlus::OpenGL;
1966 2435
1967sub new { 2436sub new {
1968 my $class = shift; 2437 my $class = shift;
1969 2438
1970 $class->SUPER::new ( 2439 $class->SUPER::new (
… …
1984 my ($self) = @_; 2453 my ($self) = @_;
1985 2454
1986 (6) x 2 2455 (6) x 2
1987} 2456}
1988 2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
1989sub button_down { 2466sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2467 my ($self, $ev, $x, $y) = @_;
1991 2468
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2471 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2472 } else {
1997 return 0 2473 return 0
1998 } 2474 }
1999 2475
2000 1 2476 1
… …
2020 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2021} 2497}
2022 2498
2023############################################################################# 2499#############################################################################
2024 2500
2025package CFClient::UI::Image; 2501package CFPlus::UI::Image;
2026 2502
2027our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
2028 2504
2029use CFClient::OpenGL; 2505use CFPlus::OpenGL;
2030use Carp qw/confess/;
2031 2506
2032our %loaded_images; 2507our %texture_cache;
2033 2508
2034sub new { 2509sub new {
2035 my $class = shift; 2510 my $class = shift;
2036 2511
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2038 2516
2039 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2040 2519
2041 $loaded_images{$self->{image}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2042 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2043 2522
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2045 2524
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2526
2050 $self 2527 $self
2051} 2528}
2052 2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2053sub size_request { 2545sub size_request {
2054 my ($self) = @_; 2546 my ($self) = @_;
2055 2547
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2548 ($self->{tex}{w}, $self->{tex}{h})
2057} 2549}
2058 2550
2059sub _draw { 2551sub _draw {
2060 my ($self) = @_; 2552 my ($self) = @_;
2061 2553
… …
2071 } 2563 }
2072 2564
2073 glEnable GL_TEXTURE_2D; 2565 glEnable GL_TEXTURE_2D;
2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2075 2567
2076 $tex->draw_quad_alpha (0, 0, $w, $h); 2568 $tex->draw_quad (0, 0, $w, $h);
2077 2569
2078 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
2079} 2571}
2080 2572
2081############################################################################# 2573#############################################################################
2082 2574
2575package CFPlus::UI::ImageButton;
2576
2577our @ISA = CFPlus::UI::Image::;
2578
2579use CFPlus::OpenGL;
2580
2581my %textures;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 padding_x => 4,
2588 padding_y => 4,
2589 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1],
2591 can_hover => 1,
2592 align => 0,
2593 valign => 0,
2594 can_events => 1,
2595 @_
2596 );
2597}
2598
2599sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_;
2601
2602 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w}
2604 && $y >= 0 && $y < $self->{h};
2605
2606 1
2607}
2608
2609#############################################################################
2610
2083package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
2084 2612
2085our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
2086 2614
2087use List::Util qw(min max); 2615use List::Util qw(min max);
2088 2616
2089use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2090 2618
2091my %tex = ( 2619my %tex = (
2092 food => [ 2620 food => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095 ], 2623 ],
2096 grace => [ 2624 grace => [
2097 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2098 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2099 ], 2627 ],
2100 hp => [ 2628 hp => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103 ], 2631 ],
2104 mana => [ 2632 mana => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2107 ], 2635 ],
2108); 2636);
2109 2637
2110# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2170 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2700
2173 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2174 my $h2 = $self->{h} * (1 - $ycut2); 2702 my $h2 = $self->{h} * (1 - $ycut2);
2703 my $h3 = $self->{h};
2704
2705 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175 2706
2176 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2708 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2709 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
… …
2198 2729
2199 if ($t3) { 2730 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2737 glEnd;
2207 } 2738 }
2208 2739
2209 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2210 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2211} 2742}
2212 2743
2213############################################################################# 2744#############################################################################
2214 2745
2215package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2216 2747
2217our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2218 2749
2219sub new { 2750sub new {
2220 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2221 2752
2222 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2224 can_hover => 1, 2755 can_hover => 1,
2225 can_events => 1, 2756 can_events => 1,
2226 %arg, 2757 %arg,
2227 ); 2758 );
2228 2759
2229 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2230 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2231 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2232 2763
2233 $self 2764 $self
2234} 2765}
2235 2766
2236sub set_fontsize { 2767sub set_fontsize {
… …
2257 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2258} 2789}
2259 2790
2260############################################################################# 2791#############################################################################
2261 2792
2262package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2263 2794
2264use strict; 2795use strict;
2265 2796
2266use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2267 2798
2268our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2269 2800
2270my @tex = 2801my @tex =
2271 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2272 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2273 2804
2274sub new { 2805sub new {
2275 my $class = shift; 2806 my $class = shift;
2276 2807
… …
2297 $self->update; 2828 $self->update;
2298 2829
2299 $self 2830 $self
2300} 2831}
2301 2832
2302sub changed { }
2303
2304sub set_range { 2833sub set_range {
2305 my ($self, $range) = @_; 2834 my ($self, $range) = @_;
2306 2835
2307 ($range, $self->{range}) = ($self->{range}, $range); 2836 ($range, $self->{range}) = ($self->{range}, $range);
2308 2837
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2838 if ("@$range" ne "@{$self->{range}}") {
2839 $self->update;
2840 $self->set_value ($self->{range}[0]);
2841 }
2311} 2842}
2312 2843
2313sub set_value { 2844sub set_value {
2314 my ($self, $value) = @_; 2845 my ($self, $value) = @_;
2315 2846
… …
2326 if $unit; 2857 if $unit;
2327 2858
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2860
2330 if ($value != $old_value) { 2861 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2862 $self->emit (changed => $value);
2332 $self->update; 2863 $self->update;
2333 } 2864 }
2334} 2865}
2335 2866
2336sub size_request { 2867sub size_request {
2337 my ($self) = @_; 2868 my ($self) = @_;
2338 2869
2339 ($self->{req_w}, $self->{req_h}) 2870 ($self->{req_w}, $self->{req_h})
2340} 2871}
2341 2872
2342sub button_down { 2873sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2344 2875
2345 $self->SUPER::button_down ($ev, $x, $y); 2876 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2877
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2879
2349 $self->mouse_motion ($ev, $x, $y) 2880 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2881}
2351 2882
2352sub mouse_motion { 2883sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2884 my ($self, $ev, $x, $y) = @_;
2354 2885
2355 if ($GRAB == $self) { 2886 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2887 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2888
… …
2363 } else { 2894 } else {
2364 return 0; 2895 return 0;
2365 } 2896 }
2366 2897
2367 1 2898 1
2899}
2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2368} 2911}
2369 2912
2370sub update { 2913sub update {
2371 my ($self) = @_; 2914 my ($self) = @_;
2372 2915
… …
2421 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2422} 2965}
2423 2966
2424############################################################################# 2967#############################################################################
2425 2968
2426package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2427 2970
2428our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2429 2972
2430sub new { 2973sub new {
2431 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2432 2975
2433 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2434 2977
2435 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift }, 2981 to_value => sub { shift },
2439 from_value => sub { shift }, 2982 from_value => sub { shift },
2440 %arg, 2983 %arg,
2441 ); 2984 );
2442 2985
… …
2462sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2464 3007
2465############################################################################# 3008#############################################################################
2466 3009
2467package CFClient::UI::TextView; 3010package CFPlus::UI::TextScroller;
2468 3011
2469our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2470 3013
2471use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2472 3015
2473sub new { 3016sub new {
2474 my $class = shift; 3017 my $class = shift;
2475 3018
2476 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2477 fontsize => 1, 3020 fontsize => 1,
2478 can_events => 0, 3021 can_events => 1,
2479 indent => 0, 3022 indent => 0,
2480 #font => default_font 3023 #font => default_font
2481 @_, 3024 @_,
2482 3025
2483 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2484 par => [], 3027 par => [],
3028 max_par => 0,
2485 height => 0, 3029 height => 0,
2486 children => [ 3030 children => [
2487 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2488 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2489 ], 3033 ],
2490 ); 3034 );
2491 3035
2492 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2493 3037
… …
2499 3043
2500 $self->{fontsize} = $fontsize; 3044 $self->{fontsize} = $fontsize;
2501 $self->reflow; 3045 $self->reflow;
2502} 3046}
2503 3047
3048sub size_request {
3049 my ($self) = @_;
3050
3051 my ($empty, $slider) = @{ $self->{children} };
3052
3053 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request
3055}
3056
2504sub size_allocate { 3057sub invoke_size_allocate {
2505 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h) = @_;
2506 3059
2507 $self->SUPER::size_allocate ($w, $h); 3060 my ($empty, $slider, @other) = @{ $self->{children} };
3061 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2508 3062
2509 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3063 $self->{layout}->set_font ($self->{font}) if $self->{font};
2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3064 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $self->{layout}->set_width ($self->{children}[0]{w}); 3065 $self->{layout}->set_width ($empty->{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3066 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2513 3067
2514 $self->reflow; 3068 $self->reflow;
2515}
2516 3069
2517sub text_size { 3070 local $self->{children} = [$empty, $slider];
3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
2518 my ($self, $text, $indent) = @_; 3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
3082}
3083
3084sub get_layout {
3085 my ($self, $para) = @_;
2519 3086
2520 my $layout = $self->{layout}; 3087 my $layout = $self->{layout};
2521 3088
3089 $layout->set_font ($self->{font}) if $self->{font};
3090 $layout->set_foreground (@{$para->{fg}});
2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3091 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2523 $layout->set_width ($self->{children}[0]{w} - $indent); 3092 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2525 $layout->set_markup ($text); 3094 $layout->set_markup ($para->{markup});
3095
3096 $layout->set_shapes (
3097 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}}
2526 3100 );
3101
2527 $layout->size 3102 $layout
2528} 3103}
2529 3104
2530sub reflow { 3105sub reflow {
2531 my ($self) = @_; 3106 my ($self) = @_;
2532 3107
… …
2539 3114
2540 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2541 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2542} 3117}
2543 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2544sub clear { 3134sub clear {
2545 my ($self) = @_; 3135 my ($self) = @_;
3136
3137 my (undef, undef, @other) = @{ $self->{children} };
3138 $self->remove ($_) for @other;
2546 3139
2547 $self->{par} = []; 3140 $self->{par} = [];
2548 $self->{height} = 0; 3141 $self->{height} = 0;
2549 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2550} 3143}
2551 3144
2552sub add_paragraph { 3145sub add_paragraph {
2553 my ($self, $color, $text, $indent) = @_; 3146 my $self = shift;
2554 3147
2555 for my $line (split /\n/, $text) { 3148 for my $para (@_) {
2556 my ($w, $h) = $self->text_size ($line); 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
3155 w => 1e10,
3156 wrapped => 1,
3157 };
3158
3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
3166
3167 $self->{need_reflow}++;
3168 $self->update;
3169}
3170
3171sub scroll_to_bottom {
3172 my ($self) = @_;
3173
3174 $self->{scroll_to} = $#{$self->{par}};
3175 $self->update;
3176}
3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
2557 $self->{height} += $h; 3200 $self->{height} = $height;
2558 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2559 }
2560 3202
2561 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
2562} 3209}
2563 3210
2564sub update { 3211sub update {
2565 my ($self) = @_; 3212 my ($self) = @_;
2566 3213
… …
2568 3215
2569 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2570 3217
2571 delete $self->{texture}; 3218 delete $self->{texture};
2572 3219
2573 $ROOT->on_post_alloc ($self, sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2574 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2575 3224
2576 if (delete $self->{need_reflow}) {
2577 my $height = 0;
2578
2579 my $layout = $self->{layout};
2580
2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2582
2583 for (@{$self->{par}}) {
2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2587 $layout->set_markup ($_->[4]);
2588 my ($w, $h) = $layout->size;
2589 $_->[0] = $w + $_->[3];
2590 $_->[1] = $h;
2591 }
2592
2593 $height += $_->[1];
2594 }
2595
2596 $self->{height} = $height;
2597
2598 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2599
2600 delete $self->{texture};
2601 }
2602
2603 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2604 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2605 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2606 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2607 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2608 3238
2609 my $y0 = $top; 3239 my $y0 = $top;
2610 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2611 3241
2612 my $y = 0;
2613
2614 my $layout = $self->{layout};
2615
2616 $layout->set_font ($self->{font}) if $self->{font};
2617
2618 glEnable GL_BLEND;
2619 #TODO# not correct in windows where rgba is forced off
2620 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2621
2622 for my $par (@{$self->{par}}) { 3242 for my $para (@{$self->{par}}) {
2623 my $h = $par->[1]; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2624 3245
2625 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2626 $layout->set_foreground (@{ $par->[2] }); 3247 my $layout = $self->get_layout ($para);
2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2629 $layout->set_markup ($par->[4]);
2630 3248
2631 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3249 $layout->render ($para->{indent}, $y - $y0);
2632 3250
2633 glRasterPos $par->[3], $y - $y0; 3251 if (my @w = @{ $para->{widget} }) {
2634 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3252 my @s = $layout->get_shapes;
3253
3254 for (@w) {
3255 my ($dx, $dy) = splice @s, 0, 2, ();
3256
3257 $_->{x} = $dx + $para->{indent};
3258 $_->{y} = $dy + $y - $y0;
3259
3260 $_->draw;
3261 }
3262 }
2635 } 3263 }
2636 3264
2637 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2638 } 3267 }
2639 3268
2640 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2641 }; 3270 };
2642 }); 3271 });
3272}
3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 $self->SUPER::reconfigure;
3278
3279 $_->{w} = 1e10 for @{ $self->{par} };
3280 $self->reflow;
2643} 3281}
2644 3282
2645sub _draw { 3283sub _draw {
2646 my ($self) = @_; 3284 my ($self) = @_;
2647 3285
… …
2650 glColor 0, 0, 0, 1; 3288 glColor 0, 0, 0, 1;
2651 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3289 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2652 glDisable GL_TEXTURE_2D; 3290 glDisable GL_TEXTURE_2D;
2653 3291
2654 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2655
2656} 3293}
2657 3294
2658############################################################################# 3295#############################################################################
2659 3296
2660package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2661 3298
2662use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2663 3300
2664our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2665 3302
2666sub moveto { 3303sub moveto {
2667 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2668 3305
2669 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2697 glPopMatrix; 3334 glPopMatrix;
2698} 3335}
2699 3336
2700############################################################################# 3337#############################################################################
2701 3338
2702package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2703 3340
2704our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2705 3342
2706sub new { 3343sub new {
2707 my $class = shift; 3344 my $class = shift;
2708 3345
2709 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2721 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2722} 3359}
2723 3360
2724############################################################################# 3361#############################################################################
2725 3362
2726package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2727 3364
2728our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2729 3366
2730use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2731 3368
2732sub new { 3369sub new {
2733 my $class = shift; 3370 my $class = shift;
2734 3371
2735 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2738 ) 3375 )
2739} 3376}
2740 3377
2741sub set_tooltip_from { 3378sub set_tooltip_from {
2742 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2743 3383
2744 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2745 3385
2746 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2747 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
2748 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2749 . "req $widget->{req_w} $widget->{req_h}\n" 3389 . "req $widget->{req_w} $widget->{req_h}\n"
2750 . "visible $widget->{visible}"; 3390 . "visible $widget->{visible}";
2751 } 3391 }
2752 3392
3393 $tooltip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//;
3395
2753 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2754 markup => $tooltip, 3397 markup => $tooltip,
2755 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2756 fontsize => 0.8, 3399 fontsize => 0.8,
2757 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2758 ellipsise => 0, 3401 ellipsise => 0,
2759 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2760 ); 3403 );
2761} 3404}
2762 3405
… …
2766 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3409 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2767 3410
2768 ($w + 4, $h + 4) 3411 ($w + 4, $h + 4)
2769} 3412}
2770 3413
2771sub size_allocate { 3414sub invoke_size_allocate {
2772 my ($self, $w, $h) = @_; 3415 my ($self, $w, $h) = @_;
2773 3416
2774 $self->SUPER::size_allocate ($w - 4, $h - 4); 3417 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2775} 3418}
2776 3419
2777sub visibility_change { 3420sub invoke_visibility_change {
2778 my ($self, $visible) = @_; 3421 my ($self, $visible) = @_;
2779 3422
2780 return unless $visible; 3423 return unless $visible;
2781 3424
2782 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2783 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2784 or return; 3427 or return;
2785 3428
3429 if ($widget->{visible}) {
2786 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2787 3431
2788 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2789 if $x + $self->{w} > $::WIDTH; 3433 if $x + $self->{w} > $self->{root}{w};
2790 3434
2791 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2792 }); 3439 });
2793} 3440}
2794 3441
2795sub _draw { 3442sub _draw {
2796 my ($self) = @_; 3443 my ($self) = @_;
… …
2820 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2821} 3468}
2822 3469
2823############################################################################# 3470#############################################################################
2824 3471
2825package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2826 3473
2827our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2828 3475
2829use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2830 3477
2831sub new { 3478sub new {
2832 my $class = shift; 3479 my $class = shift;
2833 3480
2834 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2835 aspect => 1, 3484 aspect => 1,
2836 can_events => 0, 3485 can_events => 0,
2837 @_, 3486 @_,
2838 ); 3487 );
2839 3488
2840 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2841 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2842 3491
2843 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2844 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2845 hard => 1, 3494 hard => 1,
2846 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2847 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2848 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2849 $widget->update; 3501 $self->update;
2850 }, 3502 },
2851 ); 3503 );
3504
3505 $self->update_face;
2852 } 3506 }
2853 3507
2854 $self 3508 $self
2855} 3509}
2856 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2857sub size_request { 3524sub size_request {
2858 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2859} 3540}
2860 3541
2861sub update { 3542sub update {
2862 my ($self) = @_; 3543 my ($self) = @_;
2863 3544
… …
2869sub _draw { 3550sub _draw {
2870 my ($self) = @_; 3551 my ($self) = @_;
2871 3552
2872 return unless $::CONN; 3553 return unless $::CONN;
2873 3554
2874 my $face; 3555 $self->SUPER::_draw;
2875 3556
2876 if ($self->{frame}) {
2877 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
2878 3558 or return;
2879 $face = $anim->[ $self->{frame} % @$anim ]
2880 if $anim && @$anim;
2881 }
2882 3559
2883 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
2884 3561
2885 if ($tex) { 3562 if ($tex) {
2886 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2888 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
2889 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2890 glDisable GL_TEXTURE_2D; 3567 glDisable GL_TEXTURE_2D;
2891 } 3568 }
2892} 3569}
2893 3570
2894sub DESTROY { 3571sub destroy {
2895 my ($self) = @_; 3572 my ($self) = @_;
2896 3573
2897 $self->{timer}->cancel 3574 $self->{timer}->cancel
2898 if $self->{timer}; 3575 if $self->{timer};
2899 3576
2900 $self->SUPER::DESTROY; 3577 $self->SUPER::destroy;
2901} 3578}
2902 3579
2903############################################################################# 3580#############################################################################
2904 3581
2905package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
2906 3583
2907our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
2908 3585
2909# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
2910 3587
2911############################################################################# 3588#############################################################################
2912 3589
2913package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
2914 3591
2915our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
2916 3593
2917use CFClient::OpenGL; 3594use CFPlus::OpenGL;
2918 3595
2919sub new { 3596sub new {
2920 my $class = shift; 3597 my $class = shift;
2921 3598
2922 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
2923 items => [], 3600 items => [],
2924 z => 100, 3601 z => 100,
2925 @_, 3602 @_,
2926 ); 3603 );
2927 3604
2928 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2929 3606
2930 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
2931 my ($widget, $cb, $tooltip) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
2932 3609
2933 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
2934 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
2935 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
2936 can_hover => 1, 3616 can_hover => 1,
2937 can_events => 1, 3617 can_events => 1,
2938 text => $widget,
2939 tooltip => $tooltip 3618 tooltip => $tooltip,
3619 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ],
3623 ;
3624
3625 } else {
3626 $widget = new CFPlus::UI::Label
3627 can_hover => 1,
3628 can_events => 1,
3629 markup => $widget,
3630 tooltip => $tooltip;
3631 }
2940 } 3632 }
2941 3633
2942 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
2943 3635
2944 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
2949 3641
2950# popup given the event (must be a mouse button down event currently) 3642# popup given the event (must be a mouse button down event currently)
2951sub popup { 3643sub popup {
2952 my ($self, $ev) = @_; 3644 my ($self, $ev) = @_;
2953 3645
2954 $self->_emit ("popdown"); 3646 $self->emit ("popdown");
2955 3647
2956 # maybe save $GRAB? must be careful about events... 3648 # maybe save $GRAB? must be careful about events...
2957 $GRAB = $self; 3649 $GRAB = $self;
2958 $self->{button} = $ev->{button}; 3650 $self->{button} = $ev->{button};
2959 3651
2960 $self->show; 3652 $self->show;
2961 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3653 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2962} 3654}
2963 3655
2964sub mouse_motion { 3656sub invoke_mouse_motion {
2965 my ($self, $ev, $x, $y) = @_; 3657 my ($self, $ev, $x, $y) = @_;
2966 3658
2967 # TODO: should use vbox->find_widget or so 3659 # TODO: should use vbox->find_widget or so
2968 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3660 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2969 $self->{hover} = $self->{item}{$HOVER}; 3661 $self->{hover} = $self->{item}{$HOVER};
2970 3662
2971 0 3663 0
2972} 3664}
2973 3665
2974sub button_up { 3666sub invoke_button_up {
2975 my ($self, $ev, $x, $y) = @_; 3667 my ($self, $ev, $x, $y) = @_;
2976 3668
2977 if ($ev->{button} == $self->{button}) { 3669 if ($ev->{button} == $self->{button}) {
2978 undef $GRAB; 3670 undef $GRAB;
2979 $self->hide; 3671 $self->hide;
2980 3672
2981 $self->_emit ("popdown"); 3673 $self->emit ("popdown");
2982 $self->{hover}[1]->() if $self->{hover}; 3674 $self->{hover}[1]->() if $self->{hover};
2983 } else { 3675 } else {
2984 return 0 3676 return 0
2985 } 3677 }
2986 3678
2987 1 3679 1
2988} 3680}
2989 3681
2990############################################################################# 3682#############################################################################
2991 3683
2992package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
2993 3685
2994our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
2995 3687
2996sub new { 3688sub new {
2997 my $class = shift; 3689 my $class = shift;
2998 3690
2999 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
3013 3705
3014 $self->{current} = $self->{children}[0] 3706 $self->{current} = $self->{children}[0]
3015 if @{ $self->{children} }; 3707 if @{ $self->{children} };
3016} 3708}
3017 3709
3710sub get_current_page {
3711 my ($self) = @_;
3712
3713 $self->{current}
3714}
3715
3018sub set_current_page { 3716sub set_current_page {
3019 my ($self, $page_or_widget) = @_; 3717 my ($self, $page_or_widget) = @_;
3020 3718
3021 my $widget = ref $page_or_widget 3719 my $widget = ref $page_or_widget
3022 ? $page_or_widget 3720 ? $page_or_widget
3023 : $self->{children}[$page_or_widget]; 3721 : $self->{children}[$page_or_widget];
3024 3722
3025 $self->{current} = $widget; 3723 $self->{current} = $widget;
3026 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3724 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3027 3725
3028 $self->_emit (page_changed => $self->{current}); 3726 $self->emit (page_changed => $self->{current});
3029 3727
3030 $self->realloc; 3728 $self->realloc;
3031} 3729}
3032 3730
3033sub visible_children { 3731sub visible_children {
… …
3038 my ($self) = @_; 3736 my ($self) = @_;
3039 3737
3040 $self->{current}->size_request 3738 $self->{current}->size_request
3041} 3739}
3042 3740
3043sub size_allocate { 3741sub invoke_size_allocate {
3044 my ($self, $w, $h) = @_; 3742 my ($self, $w, $h) = @_;
3045 3743
3046 $self->{current}->configure (0, 0, $w, $h); 3744 $self->{current}->configure (0, 0, $w, $h);
3745
3746 1
3047} 3747}
3048 3748
3049sub _draw { 3749sub _draw {
3050 my ($self) = @_; 3750 my ($self) = @_;
3051 3751
3052 $self->{current}->draw; 3752 $self->{current}->draw;
3053} 3753}
3054 3754
3055############################################################################# 3755#############################################################################
3056 3756
3057package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3058 3758
3059our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3060 3760
3061sub new { 3761sub new {
3062 my $class = shift; 3762 my $class = shift;
3063 3763
3064 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3065 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3066 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3067 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3068 @_, 3768 @_,
3069 ); 3769 );
3070 3770
3071 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3075} 3775}
3076 3776
3077sub add { 3777sub add {
3078 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3079 3779
3080 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3081 3781
3082 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3083 markup => $title, 3783 markup => $title,
3084 tooltip => $tooltip, 3784 tooltip => $tooltip,
3085 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3086 ); 3786 );
3087 3787
3088 $self->{multiplexer}->add ($widget); 3788 $self->{multiplexer}->add ($widget);
3089} 3789}
3090 3790
3791sub get_current_page {
3792 my ($self) = @_;
3793
3794 $self->{multiplexer}->get_current_page
3795}
3796
3091sub set_current_page { 3797sub set_current_page {
3092 my ($self, $page) = @_; 3798 my ($self, $page) = @_;
3093 3799
3094 $self->{multiplexer}->set_current_page ($page); 3800 $self->{multiplexer}->set_current_page ($page);
3095 $self->_emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3096} 3802}
3097 3803
3098############################################################################# 3804#############################################################################
3099 3805
3100package CFClient::UI::Combobox; 3806package CFPlus::UI::Selector;
3101 3807
3102use utf8; 3808use utf8;
3103 3809
3104our @ISA = CFClient::UI::Button::; 3810our @ISA = CFPlus::UI::Button::;
3105 3811
3106sub new { 3812sub new {
3107 my $class = shift; 3813 my $class = shift;
3108 3814
3109 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ... 3816 options => [], # [value, title, longdesc], ...
3111 value => undef, 3817 value => undef,
3112 @_, 3818 @_,
3113 ); 3819 );
3114 3820
3115 $self->_set_value ($self->{value}); 3821 $self->_set_value ($self->{value});
3116 3822
3117 $self 3823 $self
3118} 3824}
3119 3825
3120sub button_down { 3826sub invoke_button_down {
3121 my ($self, $ev) = @_; 3827 my ($self, $ev) = @_;
3122 3828
3123 my @menu_items; 3829 my @menu_items;
3124 3830
3125 for (@{ $self->{options} }) { 3831 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_; 3832 my ($value, $title, $tooltip) = @$_;
3127 3833
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3129 } 3835 }
3130 3836
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132} 3838}
3133 3839
3134sub _set_value { 3840sub _set_value {
3135 my ($self, $value) = @_; 3841 my ($self, $value) = @_;
3136 3842
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3138 or return; 3844 or return;
3139 3845
3140 $self->{value} = $item->[1]; 3846 $self->{value} = $item->[0];
3141 $self->set_markup ("$item->[0] ⇓"); 3847 $self->set_markup ("$item->[1] ⇓");
3142 $self->set_tooltip ($item->[2]); 3848 $self->set_tooltip ($item->[2]);
3143} 3849}
3144 3850
3145sub set_value { 3851sub set_value {
3146 my ($self, $value) = @_; 3852 my ($self, $value) = @_;
3147 3853
3148 return unless $self->{value} ne $value; 3854 return unless $self->{value} ne $value;
3149 3855
3150 $self->_set_value ($value); 3856 $self->_set_value ($value);
3151 $self->_emit (changed => $value); 3857 $self->emit (changed => $value);
3152} 3858}
3153 3859
3154############################################################################# 3860#############################################################################
3155 3861
3156package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3157 3863
3158our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3159 3865
3160sub new { 3866sub new {
3161 my $class = shift; 3867 my $class = shift;
3162 3868
3163 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3164 fontsize => 0.8, 3870 fontsize => 0.8,
3165 @_, 3871 @_,
3166 ); 3872 );
3167 3873
3168 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3169 3875
3170 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3171 3877
3172 $self 3878 $self
3173} 3879}
… …
3175sub reorder { 3881sub reorder {
3176 my ($self) = @_; 3882 my ($self) = @_;
3177 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3178 3884
3179 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3180 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3181 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3182 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3183 3889
3184 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3185 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3186 } 3892 }
… …
3207 for ($short) { 3913 for ($short) {
3208 s/^\s+//; 3914 s/^\s+//;
3209 s/\s+/ /g; 3915 s/\s+/ /g;
3210 } 3916 }
3211 3917
3212 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3213 markup => $short, 3919 markup => $short,
3214 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3215 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3216 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3217 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3255 $item->{count}++; 3961 $item->{count}++;
3256 } else { 3962 } else {
3257 $item->{count} = 1; 3963 $item->{count} = 1;
3258 $item->{text} = $item->{tooltip} = $text; 3964 $item->{text} = $item->{tooltip} = $text;
3259 } 3965 }
3260 $item->{id} = ++$self->{id}; 3966 $item->{id} += 0.2;#d#
3261 $item->{timeout} = $timeout; 3967 $item->{timeout} = $timeout;
3262 delete $item->{label}; 3968 delete $item->{label};
3263 } else { 3969 } else {
3264 $self->{item}{$group} = { 3970 $self->{item}{$group} = {
3265 id => ++$self->{id}, 3971 id => ++$self->{id},
… …
3271 count => 1, 3977 count => 1,
3272 %arg, 3978 %arg,
3273 }; 3979 };
3274 } 3980 }
3275 3981
3982 $ROOT->on_refresh (reorder => sub {
3276 $self->reorder; 3983 $self->reorder;
3984 });
3277} 3985}
3278 3986
3279sub reconfigure { 3987sub reconfigure {
3280 my ($self) = @_; 3988 my ($self) = @_;
3281 3989
… …
3284 3992
3285 $self->reorder; 3993 $self->reorder;
3286 $self->SUPER::reconfigure; 3994 $self->SUPER::reconfigure;
3287} 3995}
3288 3996
3289sub DESTROY { 3997sub destroy {
3290 my ($self) = @_; 3998 my ($self) = @_;
3291 3999
3292 $self->{timer}->cancel; 4000 $self->{timer}->cancel;
3293 4001
3294 $self->SUPER::DESTROY; 4002 $self->SUPER::destroy;
3295} 4003}
3296 4004
3297############################################################################# 4005#############################################################################
3298 4006
3299package CFClient::UI::Inventory;
3300
3301our @ISA = CFClient::UI::ScrolledWindow::;
3302
3303sub new {
3304 my $class = shift;
3305
3306 my $self = $class->SUPER::new (
3307 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3308 @_,
3309 );
3310
3311 $self
3312}
3313
3314sub set_items {
3315 my ($self, $items) = @_;
3316
3317 $self->{child}->clear;
3318 return unless $items;
3319
3320 my @items = sort {
3321 ($a->{type} <=> $b->{type})
3322 or ($a->{name} cmp $b->{name})
3323 } @$items;
3324
3325 $self->{real_items} = \@items;
3326
3327 my $row = 0;
3328 for my $item (@items) {
3329 CFClient::Item::update_widgets $item;
3330
3331 $self->{child}->add (0, $row, $item->{face_widget});
3332 $self->{child}->add (1, $row, $item->{desc_widget});
3333 $self->{child}->add (2, $row, $item->{weight_widget});
3334
3335 $row++;
3336 }
3337}
3338
3339#############################################################################
3340
3341package CFClient::UI::BindEditor;
3342
3343our @ISA = CFClient::UI::FancyFrame::;
3344
3345sub new {
3346 my $class = shift;
3347
3348 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3349
3350 $self->add (my $vb = new CFClient::UI::VBox);
3351
3352
3353 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3354 text => "start recording",
3355 tooltip => "Start/Stops recording of actions."
3356 ."All subsequent actions after the recording started will be captured."
3357 ."The actions are displayed after the record was stopped."
3358 ."To bind the action you have to click on the 'Bind' button",
3359 on_activate => sub {
3360 unless ($self->{recording}) {
3361 $self->start;
3362 } else {
3363 $self->stop;
3364 }
3365 });
3366
3367 $vb->add (new CFClient::UI::Label text => "Actions:");
3368 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3369
3370 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3371 $vb->add (my $hb = new CFClient::UI::HBox);
3372 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3373 $hb->add (new CFClient::UI::Button
3374 text => "bind",
3375 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3376 on_activate => sub {
3377 $self->ask_for_bind;
3378 });
3379
3380 $vb->add (my $hb = new CFClient::UI::HBox);
3381 $hb->add (new CFClient::UI::Button
3382 text => "ok",
3383 expand => 1,
3384 tooltip => "This closes the binding editor and saves the binding",
3385 on_activate => sub {
3386 $self->hide;
3387 $self->commit;
3388 });
3389
3390 $hb->add (new CFClient::UI::Button
3391 text => "cancel",
3392 expand => 1,
3393 tooltip => "This closes the binding editor without saving",
3394 on_activate => sub {
3395 $self->hide;
3396 $self->{binding_cancel}->()
3397 if $self->{binding_cancel};
3398 });
3399
3400 $self->update_binding_widgets;
3401
3402 $self
3403}
3404
3405sub commit {
3406 my ($self) = @_;
3407 my ($mod, $sym, $cmds) = $self->get_binding;
3408 if ($sym != 0 && @$cmds > 0) {
3409 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3410 ."'. Don't forget 'Save Config'!");
3411 $self->{binding_change}->($mod, $sym, $cmds)
3412 if $self->{binding_change};
3413 } else {
3414 $::STATUSBOX->add ("No action bound, no key or action specified!");
3415 $self->{binding_cancel}->()
3416 if $self->{binding_cancel};
3417 }
3418}
3419
3420sub start {
3421 my ($self) = @_;
3422
3423 $self->{rec_btn}->set_text ("stop recording");
3424 $self->{recording} = 1;
3425 $self->clear_command_list;
3426 $::CONN->start_record if $::CONN;
3427}
3428
3429sub stop {
3430 my ($self) = @_;
3431
3432 $self->{rec_btn}->set_text ("start recording");
3433 $self->{recording} = 0;
3434
3435 my $rec;
3436 $rec = $::CONN->stop_record if $::CONN;
3437 return unless ref $rec eq 'ARRAY';
3438 $self->set_command_list ($rec);
3439}
3440
3441
3442sub ask_for_bind_and_commit {
3443 my ($self) = @_;
3444 $self->ask_for_bind (1);
3445}
3446
3447sub ask_for_bind {
3448 my ($self, $commit) = @_;
3449
3450 CFClient::Binder::open_binding_dialog (sub {
3451 my ($mod, $sym) = @_;
3452 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3453 $self->update_binding_widgets;
3454 $self->commit if $commit;
3455 });
3456}
3457
3458# $mod and $sym are the modifiers and key symbol
3459# $cmds is a array ref of strings (the commands)
3460# $cb is the callback that is executed on OK
3461# $ccb is the callback that is executed on CANCEL and
3462# when the binding was unsuccessful on OK
3463sub set_binding {
3464 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3465
3466 $self->clear_command_list;
3467 $self->{recording} = 0;
3468 $self->{rec_btn}->set_text ("start recording");
3469
3470 $self->{binding} = [$mod, $sym];
3471 $self->{commands} = $cmds;
3472
3473 $self->{binding_change} = $cb;
3474 $self->{binding_cancel} = $ccb;
3475
3476 $self->update_binding_widgets;
3477}
3478
3479# this is a shortcut method that asks for a binding
3480# and then just binds it.
3481sub do_quick_binding {
3482 my ($self, $cmds) = @_;
3483 $self->set_binding (undef, undef, $cmds, sub {
3484 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3485 });
3486 $self->ask_for_bind (1);
3487}
3488
3489sub update_binding_widgets {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3493 $self->set_command_list ($cmds);
3494}
3495
3496sub get_binding {
3497 my ($self) = @_;
3498 return (
3499 $self->{binding}->[0],
3500 $self->{binding}->[1],
3501 [ grep { defined $_ } @{$self->{commands}} ]
3502 );
3503}
3504
3505sub clear_command_list {
3506 my ($self) = @_;
3507 $self->{cmdbox}->clear ();
3508}
3509
3510sub set_command_list {
3511 my ($self, $cmds) = @_;
3512
3513 $self->{cmdbox}->clear ();
3514 $self->{commands} = $cmds;
3515
3516 my $idx = 0;
3517
3518 for (@$cmds) {
3519 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3520
3521 my $i = $idx;
3522 $hb->add (new CFClient::UI::Label text => $_);
3523 $hb->add (new CFClient::UI::Button
3524 text => "delete",
3525 tooltip => "Deletes the action from the record",
3526 on_activate => sub {
3527 $self->{cmdbox}->remove ($hb);
3528 $cmds->[$i] = undef;
3529 });
3530
3531
3532 $idx++
3533 }
3534}
3535
3536#############################################################################
3537
3538package CFClient::UI::SpellList;
3539
3540our @ISA = CFClient::UI::Table::;
3541
3542sub new {
3543 my $class = shift;
3544
3545 my $self = $class->SUPER::new (
3546 binding => [],
3547 commands => [],
3548 @_,
3549 )
3550}
3551
3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3558
3559sub rebuild_spell_list {
3560 my ($self) = @_;
3561
3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620#############################################################################
3621
3622package CFClient::UI::Root; 4007package CFPlus::UI::Root;
3623 4008
3624our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3625 4010
3626use List::Util qw(min max); 4011use List::Util qw(min max);
3627 4012
3628use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3629 4014
3630sub new { 4015sub new {
3631 my $class = shift; 4016 my $class = shift;
3632 4017
3633 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3634 visible => 1, 4019 visible => 1,
3635 @_, 4020 @_,
3636 ); 4021 );
3637 4022
3638 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3639 4024
3640 $self 4025 $self
3641} 4026}
3642 4027
3643sub size_request { 4028sub size_request {
… …
3658 $coord = $max - $size if $coord > $max - $size; 4043 $coord = $max - $size if $coord > $max - $size;
3659 4044
3660 int $coord + 0.5 4045 int $coord + 0.5
3661} 4046}
3662 4047
3663sub size_allocate { 4048sub invoke_size_allocate {
3664 my ($self, $w, $h) = @_; 4049 my ($self, $w, $h) = @_;
3665 4050
3666 for my $child ($self->children) { 4051 for my $child ($self->children) {
3667 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3668 4053
… …
3672 $X = _to_pixel $X, $W, $self->{w}; 4057 $X = _to_pixel $X, $W, $self->{w};
3673 $Y = _to_pixel $Y, $H, $self->{h}; 4058 $Y = _to_pixel $Y, $H, $self->{h};
3674 4059
3675 $child->configure ($X, $Y, $W, $H); 4060 $child->configure ($X, $Y, $W, $H);
3676 } 4061 }
4062
4063 1
3677} 4064}
3678 4065
3679sub coord2local { 4066sub coord2local {
3680 my ($self, $x, $y) = @_; 4067 my ($self, $x, $y) = @_;
3681 4068
… …
3807 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3808 4195
3809 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3810 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3811 4198
4199 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h;
4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207
3812 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3813 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
3814 4210
3815 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3816 $widget->{old_w} = $widget->{w}; 4212 $widget->{old_w} = $widget->{w};
… …
3839 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3840 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3841 glLoadIdentity; 4237 glLoadIdentity;
3842 4238
3843 { 4239 {
3844 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
3845 4241
3846 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3847 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
3848 }
3849 4244
3850 $self->_draw; 4245 $self->_draw;
4246 }
3851} 4247}
3852 4248
3853############################################################################# 4249#############################################################################
3854 4250
3855package CFClient::UI; 4251package CFPlus::UI;
3856 4252
3857$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3858$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3859 4255
38601 42561
3861 4257

Diff Legend

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