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

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

Diff Legend

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