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

Diff Legend

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