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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

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

Diff Legend

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