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

Diff Legend

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