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

Diff Legend

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