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

Diff Legend

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