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

Diff Legend

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