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

Diff Legend

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