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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

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

Diff Legend

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