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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

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

Diff Legend

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