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

Diff Legend

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