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.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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