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

Diff Legend

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