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

Diff Legend

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