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.399 by root, Sat Jul 21 16:07:53 2007 UTC

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

Diff Legend

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