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.403 by root, Sat Jul 21 21:25:23 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
… …
574} 649}
575 650
576sub DESTROY { 651sub DESTROY {
577 my ($self) = @_; 652 my ($self) = @_;
578 653
654 return if CFPlus::in_destruct;
655
656 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
579 delete $WIDGET{$self+0}; 659 delete $WIDGET{$self+0};
580 #$self->deactivate;
581} 660}
582 661
583############################################################################# 662#############################################################################
584 663
585package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
586 665
587our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
588 667
589use strict; 668use strict;
590use CFClient::OpenGL; 669use CFPlus::OpenGL;
591 670
592sub new { 671sub new {
593 my $class = shift; 672 my $class = shift;
594 673
595 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
610 689
611 if ($color && (@$color < 4 || $color->[3])) { 690 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 691 my ($w, $h) = @$self{qw(w h)};
613 692
614 glEnable GL_BLEND; 693 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 695 glColor_premultiply @$color;
617 696
618 glBegin GL_QUADS; 697 glBegin GL_QUADS;
619 glVertex 0 , 0; 698 glVertex 0 , 0;
620 glVertex 0 , $h; 699 glVertex 0 , $h;
621 glVertex $w, $h; 700 glVertex $w, $h;
… …
626 } 705 }
627} 706}
628 707
629############################################################################# 708#############################################################################
630 709
631package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
632 711
633our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
634 713
635sub new { 714sub new {
636 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
638} 717}
… …
645 724
646sub draw { } 725sub draw { }
647 726
648############################################################################# 727#############################################################################
649 728
650package CFClient::UI::Container; 729package CFPlus::UI::Container;
651 730
652our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
653 732
654sub new { 733sub new {
655 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
656 735
657 my $children = delete $arg{children} || []; 736 my $children = delete $arg{children};
658 737
659 my $self = $class->SUPER::new ( 738 my $self = $class->SUPER::new (
660 children => [], 739 children => [],
661 can_events => 0, 740 can_events => 0,
662 %arg, 741 %arg,
663 ); 742 );
743
664 $self->add ($_) for @$children; 744 $self->add (@$children)
745 if $children && @$children;
665 746
666 $self 747 $self
748}
749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
667} 756}
668 757
669sub add { 758sub add {
670 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
671 760
672 $_->set_parent ($self) 761 $_->set_parent ($self)
673 for @widgets; 762 for @widgets;
674 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
675 use sort 'stable'; 765 use sort 'stable';
676 766
677 $self->{children} = [ 767 $self->{children} = [
678 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
679 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
680 ]; 770 ];
681 771
682 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
683} 775}
684 776
685sub children { 777sub children {
686 @{ $_[0]{children} } 778 @{ $_[0]{children} }
687} 779}
… …
698} 790}
699 791
700sub clear { 792sub clear {
701 my ($self) = @_; 793 my ($self) = @_;
702 794
703 my $children = delete $self->{children}; 795 my $children = $self->{children};
704 $self->{children} = []; 796 $self->{children} = [];
705 797
706 for (@$children) { 798 for (@$children) {
707 delete $_->{parent}; 799 delete $_->{parent};
708 $_->hide; 800 $_->hide;
… …
717 $x -= $self->{x}; 809 $x -= $self->{x};
718 $y -= $self->{y}; 810 $y -= $self->{y};
719 811
720 my $res; 812 my $res;
721 813
722 for (reverse @{ $self->{children} }) { 814 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 815 $res = $_->find_widget ($x, $y)
724 and return $res; 816 and return $res;
725 } 817 }
726 818
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 819 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
733 $_->draw for @{$self->{children}}; 825 $_->draw for @{$self->{children}};
734} 826}
735 827
736############################################################################# 828#############################################################################
737 829
738package CFClient::UI::Bin; 830package CFPlus::UI::Bin;
739 831
740our @ISA = CFClient::UI::Container::; 832our @ISA = CFPlus::UI::Container::;
741 833
742sub new { 834sub new {
743 my ($class, %arg) = @_; 835 my ($class, %arg) = @_;
744 836
745 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
746 838
747 $class->SUPER::new (children => [$child], %arg) 839 $class->SUPER::new (children => [$child], %arg)
748} 840}
749 841
750sub add { 842sub add {
751 my ($self, $child) = @_; 843 my ($self, $child) = @_;
752 844
753 $self->{children} = []; 845 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 846 $self->SUPER::add ($child);
756} 847}
757 848
758sub remove { 849sub remove {
759 my ($self, $widget) = @_; 850 my ($self, $widget) = @_;
760 851
761 $self->SUPER::remove ($widget); 852 $self->SUPER::remove ($widget);
762 853
763 $self->{children} = [new CFClient::UI::Empty] 854 $self->{children} = [new CFPlus::UI::Empty]
764 unless @{$self->{children}}; 855 unless @{$self->{children}};
765} 856}
766 857
767sub child { $_[0]->{children}[0] } 858sub child { $_[0]->{children}[0] }
768 859
769sub size_request { 860sub size_request {
770 $_[0]{children}[0]->size_request 861 $_[0]{children}[0]->size_request
771} 862}
772 863
773sub size_allocate { 864sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 865 my ($self, $w, $h) = @_;
775 866
776 $self->{children}[0]->configure (0, 0, $w, $h); 867 $self->{children}[0]->configure (0, 0, $w, $h);
868
869 1
777} 870}
778 871
779############################################################################# 872#############################################################################
780 873
874# back-buffered drawing area
875
781package CFClient::UI::Window; 876package CFPlus::UI::Window;
782 877
783our @ISA = CFClient::UI::Bin::; 878our @ISA = CFPlus::UI::Bin::;
784 879
785use CFClient::OpenGL; 880use CFPlus::OpenGL;
786 881
787sub new { 882sub new {
788 my ($class, %arg) = @_; 883 my ($class, %arg) = @_;
789 884
790 my $self = $class->SUPER::new (%arg); 885 my $self = $class->SUPER::new (%arg);
… …
795 890
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 891 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 892 $self->SUPER::update;
798} 893}
799 894
800sub size_allocate { 895sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
802 897
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 898 $self->update;
899
900 $self->SUPER::invoke_size_allocate ($w, $h)
805} 901}
806 902
807sub _render { 903sub _render {
904 my ($self) = @_;
905
808 $_[0]{children}[0]->draw; 906 $self->{children}[0]->draw;
809} 907}
810 908
811sub render_child { 909sub render_child {
812 my ($self) = @_; 910 my ($self) = @_;
813 911
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 913 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
817 915
916 {
917 package CFPlus::UI::Base;
918
919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
920 (0, 0, $self->{w}, $self->{h});
921
818 $self->_render; 922 $self->_render;
923 }
819 }; 924 };
820} 925}
821 926
822sub _draw { 927sub _draw {
823 my ($self) = @_; 928 my ($self) = @_;
824
825 my ($w, $h) = ($self->w, $self->h);
826 929
827 my $tex = $self->{texture} 930 my $tex = $self->{texture}
828 or return; 931 or return;
829 932
830 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 935 glColor 0, 0, 0, 1;
833 936
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
835 938
836 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
837} 940}
838 941
839############################################################################# 942#############################################################################
840 943
841package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
842 945
946use List::Util qw(min max);
947
843our @ISA = CFClient::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
844 949
845sub new { 950sub new {
846 my $class = shift; 951 my $class = shift;
847 952
848 $class->SUPER::new ( 953 $class->SUPER::new (
… …
855sub size_request { 960sub size_request {
856 my ($self) = @_; 961 my ($self) = @_;
857 962
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859 964
860 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
862 967
863 ($w, $h) 968 ($w, $h)
864} 969}
865 970
866sub size_allocate { 971sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 972 my ($self, $w, $h) = @_;
868 973
869 my $child = $self->child; 974 my $child = $self->child;
870 975
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 976 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 977 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 978
874 $self->child->configure (0, 0, $w, $h); 979 $self->child->configure (0, 0, $w, $h);
875 $self->update; 980 $self->update;
981
982 1
876} 983}
877 984
878sub set_offset { 985sub set_offset {
879 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
880 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
881 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
882 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
883 994
995 $self->emit (changed => $x, $y);
884 $self->update; 996 $self->update;
997 }
885} 998}
886 999
887# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local { 1001sub coord2local {
889 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
904 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
905 1018
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) { 1021 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else { 1023 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
912 } 1025 }
913} 1026}
914 1027
915sub _render { 1028sub _render {
916 my ($self) = @_; 1029 my ($self) = @_;
917 1030
1031 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1033
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 1035
920 $self->SUPER::_render; 1036 $self->SUPER::_render;
921} 1037}
922 1038
923############################################################################# 1039#############################################################################
924 1040
925package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
926 1042
927our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
928 1044
929sub new { 1045sub new {
930 my $class = shift; 1046 my ($class, %arg) = @_;
1047
1048 my $child = delete $arg{child};
931 1049
932 my $self; 1050 my $self;
933 1051
934 my $slider = new CFClient::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
935 vertical => 1, 1066 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1068 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939 }, 1071 },
940 ; 1072 ;
941 1073
942 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
944 slider => $slider, 1078 hslider => $hslider,
945 @_, 1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1082 %arg,
946 ); 1083 );
947 1084
948 $self->{vp}->add ($self->{scrolled}); 1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
949 $self->add ($self->{vp}); 1106 $self->SUPER::add ($self->{vp});
950 $self->add ($self->{slider}); 1107
1108 $self->add ($child) if $child;
951 1109
952 $self 1110 $self
953} 1111}
954 1112
1113sub add {
1114 my ($self, $widget) = @_;
1115
1116 $self->{vp}->add ($self->{child} = $widget);
1117}
1118
955sub update { 1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
956 my ($self) = @_; 1150 my ($self, $ev) = @_;
957 1151
958 $self->SUPER::update; 1152 $self->grab_focus;
959 1153
960 # todo: overwrite size_allocate of child 1154 my $ox = $self->{vp}{view_x};
961 my $child = $self->{vp}->child; 1155 my $oy = $self->{vp}{view_y};
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1156
963} 1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
964 1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1164 };
1165}
1166
1167sub invoke_mouse_wheel {
1168 my ($self, $ev) = @_;
1169
1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1172
1173 1
1174}
1175
1176sub invoke_button_down {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if ($ev->{button} == 2) {
1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1183
1184 0
1185}
1186
1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if (delete $self->{motion}) {
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_;
1199
1200 if ($self->{motion}) {
1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1206}
1207
965sub size_allocate { 1208sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
967 1210
1211 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1212 $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} 1213}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1214
977############################################################################# 1215#############################################################################
978 1216
979package CFClient::UI::Frame; 1217package CFPlus::UI::Frame;
980 1218
981our @ISA = CFClient::UI::Bin::; 1219our @ISA = CFPlus::UI::Bin::;
982 1220
983use CFClient::OpenGL; 1221use CFPlus::OpenGL;
984 1222
985sub new { 1223sub new {
986 my $class = shift; 1224 my $class = shift;
987 1225
988 $class->SUPER::new ( 1226 $class->SUPER::new (
… …
996 1234
997 if ($self->{bg}) { 1235 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1236 my ($w, $h) = @$self{qw(w h)};
999 1237
1000 glEnable GL_BLEND; 1238 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1240 glColor_premultiply @{ $self->{bg} };
1003 1241
1004 glBegin GL_QUADS; 1242 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1243 glVertex 0 , 0;
1006 glVertex 0 , $h; 1244 glVertex 0 , $h;
1007 glVertex $w, $h; 1245 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1252 $self->SUPER::_draw;
1015} 1253}
1016 1254
1017############################################################################# 1255#############################################################################
1018 1256
1019package CFClient::UI::FancyFrame; 1257package CFPlus::UI::FancyFrame;
1020 1258
1021our @ISA = CFClient::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
1022 1260
1023use CFClient::OpenGL; 1261use CFPlus::OpenGL;
1262
1263sub new {
1264 my ($class, %arg) = @_;
1265
1266 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label
1268 align => 1,
1269 valign => 0,
1270 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75;
1272 }
1273
1274 my $self = $class->SUPER::new (
1275 # label => "",
1276 fg => [0.6, 0.3, 0.1],
1277 border => 0.8,
1278 style => 'single',
1279 %arg,
1280 );
1281
1282 $self
1283}
1284
1285sub add {
1286 my ($self, @widgets) = @_;
1287
1288 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1290}
1291
1292sub border {
1293 int $_[0]{border} * $::FONTSIZE
1294}
1295
1296sub size_request {
1297 my ($self) = @_;
1298
1299 ($self->{label_w}, undef) = $self->{label}->size_request
1300 if $self->{label};
1301
1302 my ($w, $h) = $self->SUPER::size_request;
1303
1304 (
1305 $w + $self->border * 2,
1306 $h + $self->border * 2,
1307 )
1308}
1309
1310sub invoke_size_allocate {
1311 my ($self, $w, $h) = @_;
1312
1313 my $border = $self->border;
1314
1315 $w -= List::Util::max 0, $border * 2;
1316 $h -= List::Util::max 0, $border * 2;
1317
1318 if (my $label = $self->{label}) {
1319 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1320 $label->{h} = List::Util::min $h, $border;
1321 $label->invoke_size_allocate ($label->{w}, $label->{h});
1322 }
1323
1324 $self->child->configure ($border, $border, $w, $h);
1325
1326 1
1327}
1328
1329sub _draw {
1330 my ($self) = @_;
1331
1332 my $child = $self->{children}[0];
1333
1334 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h});
1336
1337 $child->draw;
1338
1339 glColor @{$self->{fg}};
1340 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1345 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1346 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1347 glEnd;
1348
1349 if ($self->{label}) {
1350 glTranslate $border * 2, 0;
1351 $self->{label}->_draw;
1352 }
1353}
1354
1355#############################################################################
1356
1357package CFPlus::UI::Toplevel;
1358
1359our @ISA = CFPlus::UI::Bin::;
1360
1361use CFPlus::OpenGL;
1024 1362
1025my $bg = 1363my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1365 mipmap => 1, wrap => 1;
1028 1366
1029my @border = 1367my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1368 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); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1374
1033sub new { 1375sub new {
1034 my $class = shift; 1376 my ($class, %arg) = @_;
1035 1377
1036 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1379 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1380 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1381 border => 0.6,
1040 can_events => 1, 1382 can_events => 1,
1041 min_w => 16, 1383 min_w => 64,
1042 min_h => 16, 1384 min_h => 32,
1043 @_ 1385 %arg,
1044 ); 1386 );
1045 1387
1046 $self->{title} &&= new CFClient::UI::Label 1388 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1389 align => 0,
1048 valign => 1, 1390 valign => 1,
1049 text => $self->{title}, 1391 text => $self->{title},
1050 fontsize => $self->{border}; 1392 fontsize => $self->{border},
1393 if exists $self->{title};
1394
1395 if ($self->{has_close_button}) {
1396 $self->{close_button} =
1397 new CFPlus::UI::ImageButton
1398 path => 'x1_close.png',
1399 on_activate => sub { $self->emit ("delete") };
1400
1401 $self->CFPlus::UI::Container::add ($self->{close_button});
1402 }
1051 1403
1052 $self 1404 $self
1405}
1406
1407sub add {
1408 my ($self, @widgets) = @_;
1409
1410 $self->SUPER::add (@widgets);
1411 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1412 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1413}
1054 1414
1055sub border { 1415sub border {
1056 int $_[0]{border} * $::FONTSIZE 1416 int $_[0]{border} * $::FONTSIZE
1057} 1417}
1058 1418
1059sub size_request { 1419sub size_request {
1060 my ($self) = @_; 1420 my ($self) = @_;
1421
1422 $self->{title_widget}->size_request
1423 if $self->{title_widget};
1424
1425 $self->{close_button}->size_request
1426 if $self->{close_button};
1061 1427
1062 my ($w, $h) = $self->SUPER::size_request; 1428 my ($w, $h) = $self->SUPER::size_request;
1063 1429
1064 ( 1430 (
1065 $w + $self->border * 2, 1431 $w + $self->border * 2,
1066 $h + $self->border * 2, 1432 $h + $self->border * 2,
1067 ) 1433 )
1068} 1434}
1069 1435
1070sub size_allocate { 1436sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1072 1438
1439 if ($self->{title_widget}) {
1440 $self->{title_widget}{w} = $w;
1441 $self->{title_widget}{h} = $h;
1442 $self->{title_widget}->invoke_size_allocate ($w, $h);
1443 }
1444
1445 my $border = $self->border;
1446
1073 $h -= List::Util::max 0, $self->border * 2; 1447 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1448 $w -= List::Util::max 0, $border * 2;
1075 1449
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); 1450 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1451
1452 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1453 if $self->{close_button};
1454
1455 1
1456}
1457
1458sub invoke_delete {
1459 my ($self) = @_;
1460
1461 $self->hide;
1462
1463 1
1464}
1465
1082sub button_down { 1466sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1467 my ($self, $ev, $x, $y) = @_;
1084 1468
1085 my ($w, $h) = @$self{qw(w h)}; 1469 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1470 my $border = $self->border;
1087 1471
… …
1103 my $dy = $ev->{y} - $oy; 1487 my $dy = $ev->{y} - $oy;
1104 1488
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1489 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1490 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1491
1492 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1493 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1494 };
1111 1495
1112 } elsif ($lr ^ $td) { 1496 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1497 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1498 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1501 my ($ev, $x, $y) = @_;
1118 1502
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1503 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1504
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1505 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1506 # HACK: the next line is required to enforce placement
1507 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1508 };
1509 } else {
1510 return 0;
1511 }
1512
1123 } 1513 1
1124} 1514}
1125 1515
1126sub button_up { 1516sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1517 my ($self, $ev, $x, $y) = @_;
1128 1518
1129 delete $self->{motion}; 1519 ! ! delete $self->{motion}
1130} 1520}
1131 1521
1132sub mouse_motion { 1522sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1523 my ($self, $ev, $x, $y) = @_;
1134 1524
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1525 $self->{motion}->($ev, $x, $y) if $self->{motion};
1526
1527 ! ! $self->{motion}
1528}
1529
1530sub invoke_visibility_change {
1531 my ($self, $visible) = @_;
1532
1533 delete $self->{motion} unless $visible;
1534
1535 0
1136} 1536}
1137 1537
1138sub _draw { 1538sub _draw {
1139 my ($self) = @_; 1539 my ($self) = @_;
1140 1540
1541 my $child = $self->{children}[0];
1542
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1543 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1544 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1545
1144 glEnable GL_TEXTURE_2D; 1546 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1548
1147 my $border = $self->border; 1549 my $border = $self->border;
1148 1550
1149 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1150 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1154 1570
1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1157 1573
1158 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1578 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1579 }
1164 1580
1165 glDisable GL_TEXTURE_2D; 1581 glDisable GL_TEXTURE_2D;
1166 1582
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1583 $child->draw;
1584
1585 if ($self->{title_widget}) {
1586 glTranslate 0, $border - $self->{h};
1587 $self->{title_widget}->_draw;
1588
1589 glTranslate 0, - ($border - $self->{h});
1590 }
1591
1592 $self->{close_button}->draw
1593 if $self->{close_button};
1170} 1594}
1171 1595
1172############################################################################# 1596#############################################################################
1173 1597
1174package CFClient::UI::Table; 1598package CFPlus::UI::Table;
1175 1599
1176our @ISA = CFClient::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1177 1601
1178use List::Util qw(max sum); 1602use List::Util qw(max sum);
1179 1603
1180use CFClient::OpenGL; 1604use CFPlus::OpenGL;
1181 1605
1182sub new { 1606sub new {
1183 my $class = shift; 1607 my $class = shift;
1184 1608
1185 $class->SUPER::new ( 1609 $class->SUPER::new (
1186 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1187 @_, 1612 @_,
1188 ) 1613 )
1189} 1614}
1190 1615
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193}
1194
1195sub add { 1616sub 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) = @_; 1617 my ($self, @widgets) = @_;
1618
1619 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1625}
1626
1627sub add_at {
1628 my $self = shift;
1629
1630 my @widgets;
1631
1632 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1634
1635 $child->{row} = $row;
1636 $child->{col} = $col;
1637
1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1645 my ($self) = @_;
1646
1647 my (@w, @h);
1207 1648
1208 my @children = $self->children; 1649 my @children = $self->children;
1209 delete $self->{children}; 1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 }
1210 1660 }
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215 1661
1216 $self->realloc; 1662 # second pass, rows
1217} 1663 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)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1232 1665
1233 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1234 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1235 } 1670 }
1236 } 1671 }
1237 1672
1238 (\@w, \@h) 1673 (\@w, \@h)
1239} 1674}
… …
1247 (sum @$ws), 1682 (sum @$ws),
1248 (sum @$hs), 1683 (sum @$hs),
1249 ) 1684 )
1250} 1685}
1251 1686
1252sub size_allocate { 1687sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1688 my ($self, $w, $h) = @_;
1254 1689
1255 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1256 1691
1257 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1259 1694
1260 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1261 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1264 1699
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1701
1269 CFClient::UI::harmonize $ws; 1702 CFPlus::UI::harmonize $ws;
1703
1704 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1;
1707
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709
1270 CFClient::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1271 1711
1272 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1273 1714
1274 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1275 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1276 or next;
1277 1717
1278 my $x = 0; 1718 $widget->configure (
1279 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1280 1721 );
1281 for my $c (0 .. $#$row) { 1722 }
1282 my $col_w = $ws->[$c];
1283 1723
1284 if (my $widget = $row->[$c]) { 1724 1
1285 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1286 }
1287 1726
1288 $x += $col_w; 1727#############################################################################
1728
1729package CFPlus::UI::Fixed;
1730
1731use List::Util qw(min max);
1732
1733our @ISA = CFPlus::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) {
1743 my ($mode, $val, $max) = @_;
1744
1745 $mode eq "abs" ? $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748}
1749
1750sub size_request {
1751 my ($self) = @_;
1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754
1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1758
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1289 } 1765 }
1290
1291 $y += $row_h;
1292 } 1766 }
1293 1767
1294} 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1295 1770
1296sub find_widget { 1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1774
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1783 }
1784 }
1785
1786 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1;
1788
1789 ($W, $H)
1790}
1791
1792sub invoke_size_allocate {
1297 my ($self, $x, $y) = @_; 1793 my ($self, $W, $H) = @_;
1298 1794
1299 $x -= $self->{x}; 1795 for my $child ($self->visible_children) {
1300 $y -= $self->{y}; 1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1301 1797
1302 my $res; 1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1303 1802
1304 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1803 $child->configure ($x, $y, $w, $h);
1305 $res = $_->find_widget ($x, $y) 1804 }
1306 and return $res; 1805
1307 } 1806 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} 1807}
1319 1808
1320############################################################################# 1809#############################################################################
1321 1810
1322package CFClient::UI::Box; 1811package CFPlus::UI::Box;
1323 1812
1324our @ISA = CFClient::UI::Container::; 1813our @ISA = CFPlus::UI::Container::;
1325 1814
1326sub size_request { 1815sub size_request {
1327 my ($self) = @_; 1816 my ($self) = @_;
1328 1817
1329 $self->{vertical} 1818 $self->{vertical}
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1825 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1826 )
1338} 1827}
1339 1828
1340sub size_allocate { 1829sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1830 my ($self, $w, $h) = @_;
1342 1831
1343 my $space = $self->{vertical} ? $h : $w; 1832 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1833 my @children = $self->visible_children;
1345 1834
1346 my @req; 1835 my @req;
1347 1836
1348 if ($self->{homogeneous}) { 1837 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1838 @req = ($space / (@children || 1)) x @children;
1350 } else { 1839 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1840 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1841 my $req = List::Util::sum @req;
1353 1842
1354 if ($req > $space) { 1843 if ($req > $space) {
1355 # ah well, not enough space 1844 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1845 $_ *= $space / $req for @req;
1357 } else { 1846 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1847 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1848
1360 $space = ($space - $req) / $expand; # remaining space to give away 1849 $space = ($space - $req) / $expand; # remaining space to give away
1361 1850
1362 $req[$_] += $space * $children->[$_]{expand} 1851 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1852 for 0 .. $#children;
1364 } 1853 }
1365 } 1854 }
1366 1855
1367 CFClient::UI::harmonize \@req; 1856 CFPlus::UI::harmonize \@req;
1368 1857
1369 my $pos = 0; 1858 my $pos = 0;
1370 for (0 .. $#$children) { 1859 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1860 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1861 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1862
1374 $pos += $alloc; 1863 $pos += $alloc;
1375 } 1864 }
1376 1865
1377 1 1866 1
1378} 1867}
1379 1868
1380############################################################################# 1869#############################################################################
1381 1870
1382package CFClient::UI::HBox; 1871package CFPlus::UI::HBox;
1383 1872
1384our @ISA = CFClient::UI::Box::; 1873our @ISA = CFPlus::UI::Box::;
1385 1874
1386sub new { 1875sub new {
1387 my $class = shift; 1876 my $class = shift;
1388 1877
1389 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1392 ) 1881 )
1393} 1882}
1394 1883
1395############################################################################# 1884#############################################################################
1396 1885
1397package CFClient::UI::VBox; 1886package CFPlus::UI::VBox;
1398 1887
1399our @ISA = CFClient::UI::Box::; 1888our @ISA = CFPlus::UI::Box::;
1400 1889
1401sub new { 1890sub new {
1402 my $class = shift; 1891 my $class = shift;
1403 1892
1404 $class->SUPER::new ( 1893 $class->SUPER::new (
… …
1407 ) 1896 )
1408} 1897}
1409 1898
1410############################################################################# 1899#############################################################################
1411 1900
1412package CFClient::UI::Label; 1901package CFPlus::UI::Label;
1413 1902
1414our @ISA = CFClient::UI::DrawBG::; 1903our @ISA = CFPlus::UI::DrawBG::;
1415 1904
1416use CFClient::OpenGL; 1905use CFPlus::OpenGL;
1417 1906
1418sub new { 1907sub new {
1419 my ($class, %arg) = @_; 1908 my ($class, %arg) = @_;
1420 1909
1421 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1913 #active_bg => none
1425 #font => default_font 1914 #font => default_font
1426 #text => initial text 1915 #text => initial text
1427 #markup => initial narkup 1916 #markup => initial narkup
1428 #max_w => maximum pixel width 1917 #max_w => maximum pixel width
1918 #style => 0, # render flags
1429 ellipsise => 3, # end 1919 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1920 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1921 fontsize => 1,
1432 align => -1, 1922 align => -1,
1433 valign => -1, 1923 valign => -1,
1434 padding_x => 2, 1924 padding_x => 2,
1435 padding_y => 2, 1925 padding_y => 2,
1436 can_events => 0, 1926 can_events => 0,
1437 %arg 1927 %arg
1438 ); 1928 );
1439 1929
1440 if (exists $self->{template}) { 1930 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1931 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1932 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1933 $self->{template} = $layout;
1444 } 1934 }
1445 1935
1446 if (exists $self->{markup}) { 1936 if (exists $self->{markup}) {
… …
1450 } 1940 }
1451 1941
1452 $self 1942 $self
1453} 1943}
1454 1944
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1945sub update {
1466 my ($self) = @_; 1946 my ($self) = @_;
1467 1947
1468 delete $self->{texture}; 1948 delete $self->{texture};
1469 $self->SUPER::update; 1949 $self->SUPER::update;
1470} 1950}
1471 1951
1952sub realloc {
1953 my ($self) = @_;
1954
1955 delete $self->{ox};
1956 $self->SUPER::realloc;
1957}
1958
1472sub set_text { 1959sub set_text {
1473 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1474 1961
1475 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1477 1964
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1480 1966
1967 delete $self->{size_req};
1481 $self->realloc; 1968 $self->realloc;
1482 $self->update; 1969 $self->update;
1483} 1970}
1484 1971
1485sub set_markup { 1972sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1490 1977
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1979
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1495 1981
1982 delete $self->{size_req};
1496 $self->realloc; 1983 $self->realloc;
1497 $self->update; 1984 $self->update;
1498} 1985}
1499 1986
1500sub size_request { 1987sub size_request {
1501 my ($self) = @_; 1988 my ($self) = @_;
1502 1989
1990 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1991 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1992 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1993 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1994 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1996
1509 my ($w, $h) = $self->{layout}->size; 1997 my ($w, $h) = $self->{layout}->size;
1510 1998
1511 if (exists $self->{template}) { 1999 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 2000 $self->{template}->set_font ($self->{font}) if $self->{font};
2001 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 2003
1515 my ($w2, $h2) = $self->{template}->size; 2004 my ($w2, $h2) = $self->{template}->size;
1516 2005
1517 $w = List::Util::max $w, $w2; 2006 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 2007 $h = List::Util::max $h, $h2;
2008 }
2009
2010 [$w, $h]
1519 } 2011 };
1520 2012
1521 ($w, $h) 2013 @{ $self->{size_req} }
1522} 2014}
1523 2015
2016sub baseline_shift {
2017 $_[0]{layout}->descent
2018}
2019
1524sub size_allocate { 2020sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 2021 my ($self, $w, $h) = @_;
1526 2022
2023 delete $self->{ox};
2024
1527 delete $self->{texture}; 2025 delete $self->{texture}
2026 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2027
2028 1
1528} 2029}
1529 2030
1530sub set_fontsize { 2031sub set_fontsize {
1531 my ($self, $fontsize) = @_; 2032 my ($self, $fontsize) = @_;
1532 2033
1533 $self->{fontsize} = $fontsize; 2034 $self->{fontsize} = $fontsize;
2035 delete $self->{size_req};
1534 delete $self->{texture}; 2036 delete $self->{texture};
1535 2037
1536 $self->realloc; 2038 $self->realloc;
1537} 2039}
1538 2040
2041sub reconfigure {
2042 my ($self) = @_;
2043
2044 delete $self->{size_req};
2045 delete $self->{texture};
2046
2047 $self->SUPER::reconfigure;
2048}
2049
1539sub _draw { 2050sub _draw {
1540 my ($self) = @_; 2051 my ($self) = @_;
1541 2052
1542 $self->SUPER::_draw; # draw background, if applicable 2053 $self->SUPER::_draw; # draw background, if applicable
1543 2054
1544 my $tex = $self->{texture} ||= do { 2055 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 2056 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2057 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 2058 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2059 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2060 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2061 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 2062
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2063 [$self->{layout}->size]
2064 };
1553 2065
2066 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2067 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2068 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 2069 : ($self->{w} - $size->[0]) * 0.5);
1557 2070
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 2073 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 2074 };
1564 2075
1565 glEnable GL_TEXTURE_2D; 2076 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2077 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 2078
1568 if ($tex->{format} == GL_ALPHA) { 2079 $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} 2080}
1577 2081
1578############################################################################# 2082#############################################################################
1579 2083
1580package CFClient::UI::EntryBase; 2084package CFPlus::UI::EntryBase;
1581 2085
1582our @ISA = CFClient::UI::Label::; 2086our @ISA = CFPlus::UI::Label::;
1583 2087
1584use CFClient::OpenGL; 2088use CFPlus::OpenGL;
1585 2089
1586sub new { 2090sub new {
1587 my $class = shift; 2091 my $class = shift;
1588 2092
1589 $class->SUPER::new ( 2093 $class->SUPER::new (
… …
1593 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1594 can_hover => 1, 2098 can_hover => 1,
1595 can_focus => 1, 2099 can_focus => 1,
1596 valign => 0, 2100 valign => 0,
1597 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1598 #text => ... 2103 #text => ...
2104 #hidden => "*",
1599 @_ 2105 @_
1600 ) 2106 )
1601} 2107}
1602 2108
1603sub _set_text { 2109sub _set_text {
… …
1605 2111
1606 delete $self->{cur_h}; 2112 delete $self->{cur_h};
1607 2113
1608 return if $self->{text} eq $text; 2114 return if $self->{text} eq $text;
1609 2115
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 2116 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 2117 $self->{text} = $text;
1614 2118
1615 $text =~ s/./*/g if $self->{hidden}; 2119 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 2120 $self->{layout}->set_text ("$text ");
2121 delete $self->{size_req};
1617 2122
1618 $self->_emit (changed => $self->{text}); 2123 $self->emit (changed => $self->{text});
2124
2125 $self->realloc;
2126 $self->update;
1619} 2127}
1620 2128
1621sub set_text { 2129sub set_text {
1622 my ($self, $text) = @_; 2130 my ($self, $text) = @_;
1623 2131
1624 $self->{cursor} = length $text; 2132 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 2133 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 2134}
1629 2135
1630sub get_text { 2136sub get_text {
1631 $_[0]{text} 2137 $_[0]{text}
1632} 2138}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 2143 my ($w, $h) = $self->SUPER::size_request;
1638 2144
1639 ($w + 1, $h) # add 1 for cursor 2145 ($w + 1, $h) # add 1 for cursor
1640} 2146}
1641 2147
1642sub key_down { 2148sub invoke_key_down {
1643 my ($self, $ev) = @_; 2149 my ($self, $ev) = @_;
1644 2150
1645 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1648 2154
1649 my $text = $self->get_text; 2155 my $text = $self->get_text;
2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1650 2158
1651 if ($uni == 8) { 2159 if ($uni == 8) {
1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1653 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1654 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1655 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1656 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1657 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1658 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1659 } elsif ($sym == CFClient::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1660 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 2183 $self->emit ('escape');
1665 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
2188 } else {
2189 return 0;
1667 } 2190 }
1668 2191
1669 $self->_set_text ($text); 2192 $self->_set_text ($text);
1670 2193
1671 $self->realloc; 2194 $self->realloc;
1672} 2195 $self->update;
1673 2196
2197 1
2198}
2199
1674sub focus_in { 2200sub invoke_focus_in {
1675 my ($self) = @_; 2201 my ($self) = @_;
1676 2202
1677 $self->{last_activity} = $::NOW; 2203 $self->{last_activity} = $::NOW;
1678 2204
1679 $self->SUPER::focus_in; 2205 $self->SUPER::invoke_focus_in
1680} 2206}
1681 2207
1682sub button_down { 2208sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1684 2210
1685 $self->SUPER::button_down ($ev, $x, $y); 2211 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 2212
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 2214
1689 # byte-index to char-index 2215 # byte-index to char-index
1690 my $text = $self->{text}; 2216 my $text = $self->{text};
1691 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1693 2219
1694 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1695 $self->update; 2221 $self->update;
2222
2223 1
1696} 2224}
1697 2225
1698sub mouse_motion { 2226sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2228# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2229
2230 1
1701} 2231}
1702 2232
1703sub _draw { 2233sub _draw {
1704 my ($self) = @_; 2234 my ($self) = @_;
1705 2235
1706 local $self->{fg} = $self->{fg}; 2236 local $self->{fg} = $self->{fg};
1707 2237
1708 if ($FOCUS == $self) { 2238 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 2239 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 2240 $self->{fg} = $self->{active_fg};
1711 } else { 2241 } else {
1712 glColor @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
1713 } 2243 }
1714 2244
1715 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 2247 glBegin GL_QUADS;
1718 glVertex 0 , 0; 2248 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 2249 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 2250 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 2251 glVertex $self->{w}, 0;
… …
1732 utf8::encode $text; 2262 utf8::encode $text;
1733 2263
1734 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1735 } 2265 }
1736 2266
1737 glColor @{$self->{fg}};
1738 glBegin GL_LINES; 2267 glBegin GL_LINES;
1739 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 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}; 2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1741 glEnd; 2270 glEnd;
1742 } 2271 }
1743} 2272}
1744 2273
2274#############################################################################
2275
1745package CFClient::UI::Entry; 2276package CFPlus::UI::Entry;
1746 2277
1747our @ISA = CFClient::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1748 2279
1749use CFClient::OpenGL; 2280use CFPlus::OpenGL;
1750 2281
1751sub key_down { 2282sub invoke_key_down {
1752 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1753 2284
1754 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1755 2286
1756 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1757 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
2290
1759 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 2293 $self->emit (activate => $txt);
1762 $self->update; 2294 $self->update;
1763 2295
1764 } elsif ($sym == CFClient::SDLK_UP) { 2296 } elsif ($sym == CFPlus::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 2297 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 2298 $self->{history_saveback} = $self->get_text;
1767 } 2299 }
1768 if (@{$self->{history} || []} > 0) { 2300 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++; 2301 $self->{history_pointer}++;
… …
1771 $self->{history_pointer} = @{$self->{history} || []} - 1; 2303 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 } 2304 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } 2306 }
1775 2307
1776 } elsif ($sym == CFClient::SDLK_DOWN) { 2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
1777 $self->{history_pointer}--; 2309 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779 2311
1780 if ($self->{history_pointer} >= 0) { 2312 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else { 2314 } else {
1783 $self->set_text ($self->{history_saveback}); 2315 $self->set_text ($self->{history_saveback});
1784 } 2316 }
1785 2317
1786 } else { 2318 } else {
1787 $self->SUPER::key_down ($ev); 2319 return $self->SUPER::invoke_key_down ($ev)
2320 }
2321
1788 } 2322 1
1789
1790} 2323}
1791 2324
1792############################################################################# 2325#############################################################################
1793 2326
2327package CFPlus::UI::TextEdit;
2328
2329our @ISA = CFPlus::UI::EntryBase::;
2330
2331use CFPlus::OpenGL;
2332
2333sub move_cursor_ver {
2334 my ($self, $dy) = @_;
2335
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337
2338 $y += $dy;
2339
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2341 $self->{cursor} = $index;
2342 delete $self->{cur_h};
2343 $self->update;
2344 return;
2345 }
2346}
2347
2348sub invoke_key_down {
2349 my ($self, $ev) = @_;
2350
2351 my $sym = $ev->{sym};
2352
2353 if ($sym == CFPlus::SDLK_UP) {
2354 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1);
2357 } else {
2358 return $self->SUPER::invoke_key_down ($ev)
2359 }
2360
2361 1
2362}
2363
2364#############################################################################
2365
1794package CFClient::UI::Button; 2366package CFPlus::UI::Button;
1795 2367
1796our @ISA = CFClient::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
1797 2369
1798use CFClient::OpenGL; 2370use CFPlus::OpenGL;
1799 2371
1800my @tex = 2372my @tex =
1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1802 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
1803 2375
1804sub new { 2376sub new {
1805 my $class = shift; 2377 my $class = shift;
1806 2378
1807 $class->SUPER::new ( 2379 $class->SUPER::new (
1808 padding_x => 4, 2380 padding_x => 4,
1809 padding_y => 4, 2381 padding_y => 4,
1810 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
1811 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
1812 can_hover => 1, 2384 can_hover => 1,
1813 align => 0, 2385 align => 0,
1814 valign => 0, 2386 valign => 0,
1815 can_events => 1, 2387 can_events => 1,
1816 @_ 2388 @_
1817 ) 2389 )
1818} 2390}
1819 2391
1820sub activate { }
1821
1822sub button_up { 2392sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2393 my ($self, $ev, $x, $y) = @_;
1824 2394
1825 $self->emit ("activate") 2395 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2396 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2397 && $y >= 0 && $y < $self->{h};
2398
2399 1
1828} 2400}
1829 2401
1830sub _draw { 2402sub _draw {
1831 my ($self) = @_; 2403 my ($self) = @_;
1832 2404
1833 local $self->{fg} = $self->{fg}; 2405 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2406
1839 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
1842 2410
2411 my $tex = $tex[$GRAB == $self];
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 2413
1845 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1846 2415
1847 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
1848} 2417}
1849 2418
1850############################################################################# 2419#############################################################################
1851 2420
1852package CFClient::UI::CheckBox; 2421package CFPlus::UI::CheckBox;
1853 2422
1854our @ISA = CFClient::UI::DrawBG::; 2423our @ISA = CFPlus::UI::DrawBG::;
1855 2424
1856my @tex = 2425my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2427 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859 2428
1860use CFClient::OpenGL; 2429use CFPlus::OpenGL;
1861 2430
1862sub new { 2431sub new {
1863 my $class = shift; 2432 my $class = shift;
1864 2433
1865 $class->SUPER::new ( 2434 $class->SUPER::new (
… …
1879 my ($self) = @_; 2448 my ($self) = @_;
1880 2449
1881 (6) x 2 2450 (6) x 2
1882} 2451}
1883 2452
2453sub toggle {
2454 my ($self) = @_;
2455
2456 $self->{state} = !$self->{state};
2457 $self->emit (changed => $self->{state});
2458 $self->update;
2459}
2460
1884sub button_down { 2461sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2462 my ($self, $ev, $x, $y) = @_;
1886 2463
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2464 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2465 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2466 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2467 } else {
2468 return 0
2469 }
2470
1891 } 2471 1
1892} 2472}
1893 2473
1894sub _draw { 2474sub _draw {
1895 my ($self) = @_; 2475 my ($self) = @_;
1896 2476
… …
1911 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
1912} 2492}
1913 2493
1914############################################################################# 2494#############################################################################
1915 2495
1916package CFClient::UI::Image; 2496package CFPlus::UI::Image;
1917 2497
1918our @ISA = CFClient::UI::Base::; 2498our @ISA = CFPlus::UI::Base::;
1919 2499
1920use CFClient::OpenGL; 2500use CFPlus::OpenGL;
1921use Carp qw/confess/;
1922 2501
1923our %loaded_images; 2502our %texture_cache;
1924 2503
1925sub new { 2504sub new {
1926 my $class = shift; 2505 my $class = shift;
1927 2506
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2507 my $self = $class->SUPER::new (
2508 can_events => 0,
2509 @_,
2510 );
1929 2511
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2512 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required";
1931 2514
1932 $loaded_images{$self->{image}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1934 2517
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
1936 2519
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2521
1941 $self 2522 $self
1942} 2523}
1943 2524
2525sub STORABLE_freeze {
2526 my ($self, $cloning) = @_;
2527
2528 $self->{path}
2529 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2530
2531 $self->{path}
2532}
2533
2534sub STORABLE_attach {
2535 my ($self, $cloning, $path) = @_;
2536
2537 $self->new (path => $path)
2538}
2539
1944sub size_request { 2540sub size_request {
1945 my ($self) = @_; 2541 my ($self) = @_;
1946 2542
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2543 ($self->{tex}{w}, $self->{tex}{h})
1948} 2544}
1949 2545
1950sub _draw { 2546sub _draw {
1951 my ($self) = @_; 2547 my ($self) = @_;
1952 2548
… …
1962 } 2558 }
1963 2559
1964 glEnable GL_TEXTURE_2D; 2560 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2562
1967 $tex->draw_quad_alpha (0, 0, $w, $h); 2563 $tex->draw_quad (0, 0, $w, $h);
1968 2564
1969 glDisable GL_TEXTURE_2D; 2565 glDisable GL_TEXTURE_2D;
1970} 2566}
1971 2567
1972############################################################################# 2568#############################################################################
1973 2569
2570package CFPlus::UI::ImageButton;
2571
2572our @ISA = CFPlus::UI::Image::;
2573
2574use CFPlus::OpenGL;
2575
2576my %textures;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 padding_x => 4,
2583 padding_y => 4,
2584 fg => [1, 1, 1],
2585 active_fg => [0, 0, 1],
2586 can_hover => 1,
2587 align => 0,
2588 valign => 0,
2589 can_events => 1,
2590 @_
2591 );
2592}
2593
2594sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_;
2596
2597 $self->emit ("activate")
2598 if $x >= 0 && $x < $self->{w}
2599 && $y >= 0 && $y < $self->{h};
2600
2601 1
2602}
2603
2604#############################################################################
2605
1974package CFClient::UI::VGauge; 2606package CFPlus::UI::VGauge;
1975 2607
1976our @ISA = CFClient::UI::Base::; 2608our @ISA = CFPlus::UI::Base::;
1977 2609
1978use List::Util qw(min max); 2610use List::Util qw(min max);
1979 2611
1980use CFClient::OpenGL; 2612use CFPlus::OpenGL;
1981 2613
1982my %tex = ( 2614my %tex = (
1983 food => [ 2615 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ], 2618 ],
1987 grace => [ 2619 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 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/ 2621 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ], 2622 ],
1991 hp => [ 2623 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ], 2626 ],
1995 mana => [ 2627 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 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/ 2629 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ], 2630 ],
1999); 2631);
2000 2632
2001# eg. VGauge->new (gauge => 'food'), default gauge: food 2633# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2693 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2694 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2695
2064 my $h1 = $self->{h} * (1 - $ycut1); 2696 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2697 my $h2 = $self->{h} * (1 - $ycut2);
2698 my $h3 = $self->{h};
2699
2700 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2701
2067 glEnable GL_BLEND; 2702 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2703 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2704 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2705 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2707
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2708 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2709 glBegin GL_QUADS;
… …
2088 2724
2089 if ($t3) { 2725 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2726 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2727 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2728 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2729 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2730 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2731 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2732 glEnd;
2097 } 2733 }
2098 2734
2099 glDisable GL_BLEND; 2735 glDisable GL_BLEND;
2100 glDisable GL_TEXTURE_2D; 2736 glDisable GL_TEXTURE_2D;
2101} 2737}
2102 2738
2103############################################################################# 2739#############################################################################
2104 2740
2105package CFClient::UI::Gauge; 2741package CFPlus::UI::Gauge;
2106 2742
2107our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFPlus::UI::VBox::;
2108 2744
2109sub new { 2745sub new {
2110 my ($class, %arg) = @_; 2746 my ($class, %arg) = @_;
2111 2747
2112 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
… …
2114 can_hover => 1, 2750 can_hover => 1,
2115 can_events => 1, 2751 can_events => 1,
2116 %arg, 2752 %arg,
2117 ); 2753 );
2118 2754
2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2755 $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); 2756 $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"); 2757 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2122 2758
2123 $self 2759 $self
2124} 2760}
2125 2761
2126sub set_fontsize { 2762sub set_fontsize {
… …
2147 $self->{value}->set_text ($val); 2783 $self->{value}->set_text ($val);
2148} 2784}
2149 2785
2150############################################################################# 2786#############################################################################
2151 2787
2152package CFClient::UI::Slider; 2788package CFPlus::UI::Slider;
2153 2789
2154use strict; 2790use strict;
2155 2791
2156use CFClient::OpenGL; 2792use CFPlus::OpenGL;
2157 2793
2158our @ISA = CFClient::UI::DrawBG::; 2794our @ISA = CFPlus::UI::DrawBG::;
2159 2795
2160my @tex = 2796my @tex =
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2162 qw(s1_slider.png s1_slider_bg.png); 2798 qw(s1_slider.png s1_slider_bg.png);
2163 2799
2164sub new { 2800sub new {
2165 my $class = shift; 2801 my $class = shift;
2166 2802
… …
2187 $self->update; 2823 $self->update;
2188 2824
2189 $self 2825 $self
2190} 2826}
2191 2827
2192sub changed { }
2193
2194sub set_range { 2828sub set_range {
2195 my ($self, $range) = @_; 2829 my ($self, $range) = @_;
2196 2830
2197 ($range, $self->{range}) = ($self->{range}, $range); 2831 ($range, $self->{range}) = ($self->{range}, $range);
2198 2832
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2833 if ("@$range" ne "@{$self->{range}}") {
2834 $self->update;
2835 $self->set_value ($self->{range}[0]);
2836 }
2201} 2837}
2202 2838
2203sub set_value { 2839sub set_value {
2204 my ($self, $value) = @_; 2840 my ($self, $value) = @_;
2205 2841
… …
2216 if $unit; 2852 if $unit;
2217 2853
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2854 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2855
2220 if ($value != $old_value) { 2856 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2857 $self->emit (changed => $value);
2222 $self->update; 2858 $self->update;
2223 } 2859 }
2224} 2860}
2225 2861
2226sub size_request { 2862sub size_request {
2227 my ($self) = @_; 2863 my ($self) = @_;
2228 2864
2229 ($self->{req_w}, $self->{req_h}) 2865 ($self->{req_w}, $self->{req_h})
2230} 2866}
2231 2867
2232sub button_down { 2868sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2869 my ($self, $ev, $x, $y) = @_;
2234 2870
2235 $self->SUPER::button_down ($ev, $x, $y); 2871 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2872
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2874
2239 $self->mouse_motion ($ev, $x, $y); 2875 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2876}
2241 2877
2242sub mouse_motion { 2878sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2244 2880
2245 if ($GRAB == $self) { 2881 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2882 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2883
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2884 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2885
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2886 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2887
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2888 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2889 } else {
2890 return 0;
2891 }
2892
2253 } 2893 1
2894}
2895
2896sub invoke_mouse_wheel {
2897 my ($self, $ev) = @_;
2898
2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904
2905 ! ! $delta
2254} 2906}
2255 2907
2256sub update { 2908sub update {
2257 my ($self) = @_; 2909 my ($self) = @_;
2258 2910
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2911 delete $self->{knob_w};
2912 $self->SUPER::update;
2913}
2914
2915sub _draw {
2916 my ($self) = @_;
2917
2918 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2919 $self->set_value ($self->{range}[0]);
2261 2920
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2921 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2922 my $range = ($hi - $page - $lo) || 1e-100;
2264 2923
… …
2270 $value = ($value - $lo) / $range; 2929 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2930 $value = $value * $self->{scale} + $self->{offset};
2272 2931
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2932 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2933 $self->{knob_w} = $knob_w;
2275 }); 2934 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2935
2283 $self->SUPER::_draw (); 2936 $self->SUPER::_draw ();
2284 2937
2285 glScale $self->{w}, $self->{h}; 2938 glScale $self->{w}, $self->{h};
2286 2939
… …
2306 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2307} 2960}
2308 2961
2309############################################################################# 2962#############################################################################
2310 2963
2311package CFClient::UI::ValSlider; 2964package CFPlus::UI::ValSlider;
2312 2965
2313our @ISA = CFClient::UI::HBox::; 2966our @ISA = CFPlus::UI::HBox::;
2314 2967
2315sub new { 2968sub new {
2316 my ($class, %arg) = @_; 2969 my ($class, %arg) = @_;
2317 2970
2318 my $range = delete $arg{range}; 2971 my $range = delete $arg{range};
2319 2972
2320 my $self = $class->SUPER::new ( 2973 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift }, 2976 to_value => sub { shift },
2324 from_value => sub { shift }, 2977 from_value => sub { shift },
2325 %arg, 2978 %arg,
2326 ); 2979 );
2327 2980
… …
2347sub set_range { shift->{slider}->set_range (@_) } 3000sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 3001sub set_value { shift->{slider}->set_value (@_) }
2349 3002
2350############################################################################# 3003#############################################################################
2351 3004
2352package CFClient::UI::TextView; 3005package CFPlus::UI::TextScroller;
2353 3006
2354our @ISA = CFClient::UI::HBox::; 3007our @ISA = CFPlus::UI::HBox::;
2355 3008
2356use CFClient::OpenGL; 3009use CFPlus::OpenGL;
2357 3010
2358sub new { 3011sub new {
2359 my $class = shift; 3012 my $class = shift;
2360 3013
2361 my $self = $class->SUPER::new ( 3014 my $self = $class->SUPER::new (
2362 fontsize => 1, 3015 fontsize => 1,
2363 can_events => 0, 3016 can_events => 1,
3017 indent => 0,
2364 #font => default_font 3018 #font => default_font
2365 @_, 3019 @_,
2366 3020
2367 layout => (new CFClient::Layout 1), 3021 layout => (new CFPlus::Layout),
2368 par => [], 3022 par => [],
3023 max_par => 0,
2369 height => 0, 3024 height => 0,
2370 children => [ 3025 children => [
2371 (new CFClient::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2373 ], 3028 ],
2374 ); 3029 );
2375 3030
2376 $self->{children}[1]->connect (changed => sub { $self->update }); 3031 $self->{children}[1]->connect (changed => sub { $self->update });
2377 3032
… …
2383 3038
2384 $self->{fontsize} = $fontsize; 3039 $self->{fontsize} = $fontsize;
2385 $self->reflow; 3040 $self->reflow;
2386} 3041}
2387 3042
3043sub size_request {
3044 my ($self) = @_;
3045
3046 my ($empty, $slider) = @{ $self->{children} };
3047
3048 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request
3050}
3051
2388sub size_allocate { 3052sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 3053 my ($self, $w, $h) = @_;
2390 3054
2391 $self->SUPER::size_allocate ($w, $h); 3055 my ($empty, $slider, @other) = @{ $self->{children} };
3056 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 3057
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3058 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3059 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 3060 $self->{layout}->set_width ($empty->{w});
3061 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 3062
2397 $self->reflow; 3063 $self->reflow;
2398}
2399 3064
2400sub text_size { 3065 local $self->{children} = [$empty, $slider];
3066 $self->SUPER::invoke_size_allocate ($w, $h)
3067}
3068
3069sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 3070 my ($self, $ev) = @_;
3071
3072 return 0 unless $ev->{dy}; # only vertical movements
3073
3074 $self->{children}[1]->emit (mouse_wheel => $ev);
3075
3076 1
3077}
3078
3079sub get_layout {
3080 my ($self, $para) = @_;
2402 3081
2403 my $layout = $self->{layout}; 3082 my $layout = $self->{layout};
2404 3083
3084 $layout->set_font ($self->{font}) if $self->{font};
3085 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3086 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 3087 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3088 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 3089 $layout->set_markup ($para->{markup});
3090
3091 $layout->set_shapes (
3092 map
3093 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3094 @{$para->{widget}}
2408 3095 );
3096
2409 $layout->size 3097 $layout
2410} 3098}
2411 3099
2412sub reflow { 3100sub reflow {
2413 my ($self) = @_; 3101 my ($self) = @_;
2414 3102
… …
2421 3109
2422 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 3111 $self->{children}[1]->set_value ($offset);
2424} 3112}
2425 3113
3114sub current_paragraph {
3115 my ($self) = @_;
3116
3117 $self->{top_paragraph} - 1
3118}
3119
3120sub scroll_to {
3121 my ($self, $para) = @_;
3122
3123 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3124
3125 $self->{scroll_to} = $para;
3126 $self->update;
3127}
3128
2426sub clear { 3129sub clear {
2427 my ($self) = @_; 3130 my ($self) = @_;
3131
3132 my (undef, undef, @other) = @{ $self->{children} };
3133 $self->remove ($_) for @other;
2428 3134
2429 $self->{par} = []; 3135 $self->{par} = [];
2430 $self->{height} = 0; 3136 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3137 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 3138}
2433 3139
2434sub add_paragraph { 3140sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 3141 my $self = shift;
2436 3142
2437 for my $line (split /\n/, $text) { 3143 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 3144 $para = {
3145 fg => [1, 1, 1, 1],
3146 indent => 0,
3147 markup => "",
3148 widget => [],
3149 ref $para ? %$para : (markup => $para),
3150 w => 1e10,
3151 wrapped => 1,
3152 };
3153
3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3155 push @{$self->{par}}, $para;
3156 }
3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
3160 }
3161
3162 $self->{need_reflow}++;
3163 $self->update;
3164}
3165
3166sub scroll_to_bottom {
3167 my ($self) = @_;
3168
3169 $self->{scroll_to} = $#{$self->{par}};
3170 $self->update;
3171}
3172
3173sub force_uptodate {
3174 my ($self) = @_;
3175
3176 if (delete $self->{need_reflow}) {
3177 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3178
3179 my $height = 0;
3180
3181 for my $para (@{$self->{par}}) {
3182 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3183 my $layout = $self->get_layout ($para);
3184 my ($w, $h) = $layout->size;
3185
3186 $para->{w} = $w + $para->{indent};
3187 $para->{h} = $h;
3188 $para->{wrapped} = $layout->has_wrapped;
3189 }
3190
3191 $para->{y} = $height;
3192 $height += $para->{h};
3193 }
3194
2439 $self->{height} += $h; 3195 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 3197
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3198 delete $self->{texture};
3199 }
3200
3201 if (my $paridx = delete $self->{scroll_to}) {
3202 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3203 }
2444} 3204}
2445 3205
2446sub update { 3206sub update {
2447 my ($self) = @_; 3207 my ($self) = @_;
2448 3208
… …
2450 3210
2451 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2452 3212
2453 delete $self->{texture}; 3213 delete $self->{texture};
2454 3214
2455 $ROOT->on_post_alloc ($self, sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 3219
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 { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 3221 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2487 3223
3224 package CFPlus::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h});
3227
3228 my $top = int $self->{children}[1]{range}[0];
3229
3230 my $paridx = 0;
3231 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2489 3233
2490 my $y0 = $top; 3234 my $y0 = $top;
2491 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2492 3236
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}}) { 3237 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2505 3240
2506 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 3242 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 3243
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3244 $layout->render ($para->{indent}, $y - $y0);
2512 3245
2513 glRasterPos $par->[3], $y - $y0; 3246 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3247 my @s = $layout->get_shapes;
3248
3249 for (@w) {
3250 my ($dx, $dy) = splice @s, 0, 2, ();
3251
3252 $_->{x} = $dx + $para->{indent};
3253 $_->{y} = $dy + $y - $y0;
3254
3255 $_->draw;
3256 }
3257 }
2515 } 3258 }
2516 3259
2517 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2518 } 3262 }
2519 3263
2520 glDisable GL_BLEND; 3264 $self->{top_paragraph} = $top_paragraph;
2521 }; 3265 };
2522 }); 3266 });
2523} 3267}
2524 3268
3269sub reconfigure {
3270 my ($self) = @_;
3271
3272 $self->SUPER::reconfigure;
3273
3274 $_->{w} = 1e10 for @{ $self->{par} };
3275 $self->reflow;
3276}
3277
2525sub _draw { 3278sub _draw {
2526 my ($self) = @_; 3279 my ($self) = @_;
2527 3280
2528 glEnable GL_TEXTURE_2D; 3281 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3283 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3284 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3285 glDisable GL_TEXTURE_2D;
2533 3286
2534 $self->{children}[1]->draw; 3287 $self->{children}[1]->draw;
2535
2536} 3288}
2537 3289
2538############################################################################# 3290#############################################################################
2539 3291
2540package CFClient::UI::Animator; 3292package CFPlus::UI::Animator;
2541 3293
2542use CFClient::OpenGL; 3294use CFPlus::OpenGL;
2543 3295
2544our @ISA = CFClient::UI::Bin::; 3296our @ISA = CFPlus::UI::Bin::;
2545 3297
2546sub moveto { 3298sub moveto {
2547 my ($self, $x, $y) = @_; 3299 my ($self, $x, $y) = @_;
2548 3300
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3329 glPopMatrix;
2578} 3330}
2579 3331
2580############################################################################# 3332#############################################################################
2581 3333
2582package CFClient::UI::Flopper; 3334package CFPlus::UI::Flopper;
2583 3335
2584our @ISA = CFClient::UI::Button::; 3336our @ISA = CFPlus::UI::Button::;
2585 3337
2586sub new { 3338sub new {
2587 my $class = shift; 3339 my $class = shift;
2588 3340
2589 my $self = $class->SUPER::new ( 3341 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3353 $self->{other}->toggle_visibility;
2602} 3354}
2603 3355
2604############################################################################# 3356#############################################################################
2605 3357
2606package CFClient::UI::Tooltip; 3358package CFPlus::UI::Tooltip;
2607 3359
2608our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2609 3361
2610use CFClient::OpenGL; 3362use CFPlus::OpenGL;
2611 3363
2612sub new { 3364sub new {
2613 my $class = shift; 3365 my $class = shift;
2614 3366
2615 $class->SUPER::new ( 3367 $class->SUPER::new (
… …
2618 ) 3370 )
2619} 3371}
2620 3372
2621sub set_tooltip_from { 3373sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3374 my ($self, $widget) = @_;
3375
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
2623 3378
2624 my $tooltip = $widget->{tooltip}; 3379 my $tooltip = $widget->{tooltip};
2625 3380
2626 if ($ENV{CFPLUS_DEBUG} & 2) { 3381 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 3382 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3383 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 3384 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 3385 . "visible $widget->{visible}";
2631 } 3386 }
2632 3387
3388 $tooltip =~ s/^\n+//;
3389 $tooltip =~ s/\n+$//;
3390
2633 $self->add (new CFClient::UI::Label 3391 $self->add (new CFPlus::UI::Label
2634 markup => $tooltip, 3392 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 3394 fontsize => 0.8,
2637 fg => [0, 0, 0, 1], 3395 style => 1, # FLAG_INVERSE
2638 ellipsise => 0, 3396 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP), 3397 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 ); 3398 );
2641} 3399}
2642 3400
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3404 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 3405
2648 ($w + 4, $h + 4) 3406 ($w + 4, $h + 4)
2649} 3407}
2650 3408
2651sub size_allocate { 3409sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 3410 my ($self, $w, $h) = @_;
2653 3411
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 3412 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 3413}
2656 3414
2657sub visibility_change { 3415sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 3416 my ($self, $visible) = @_;
2659 3417
2660 return unless $visible; 3418 return unless $visible;
2661 3419
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 3420 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner} 3421 my $widget = $self->{owner}
2664 or return; 3422 or return;
2665 3423
3424 if ($widget->{visible}) {
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3425 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 3426
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3427 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 3428 if $x + $self->{w} > $self->{root}{w};
2670 3429
2671 $self->move_abs ($x, $y); 3430 $self->move_abs ($x, $y);
3431 } else {
3432 $self->hide;
3433 }
2672 }); 3434 });
2673} 3435}
2674 3436
2675sub _draw { 3437sub _draw {
2676 my ($self) = @_; 3438 my ($self) = @_;
… …
2700 $self->SUPER::_draw; 3462 $self->SUPER::_draw;
2701} 3463}
2702 3464
2703############################################################################# 3465#############################################################################
2704 3466
2705package CFClient::UI::Face; 3467package CFPlus::UI::Face;
2706 3468
2707our @ISA = CFClient::UI::Base::; 3469our @ISA = CFPlus::UI::DrawBG::;
2708 3470
2709use CFClient::OpenGL; 3471use CFPlus::OpenGL;
2710 3472
2711sub new { 3473sub new {
2712 my $class = shift; 3474 my $class = shift;
2713 3475
2714 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
2715 aspect => 1, 3479 aspect => 1,
2716 can_events => 0, 3480 can_events => 0,
2717 @_, 3481 @_,
2718 ); 3482 );
2719 3483
2720 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
2722 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2723 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1, 3490 parked => 1,
2726 interval => $self->{animspeed},
2727 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
2728 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
2729 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
2730 }, 3499 },
2731 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
2732 } 3504 }
2733 3505
2734 $self 3506 $self
2735} 3507}
2736 3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3524}
3525
3526sub update_face {
3527 my ($self) = @_;
3528
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3536 }
3537 }
3538}
3539
2737sub size_request { 3540sub size_request {
2738 (32, 8) 3541 my ($self) = @_;
3542
3543 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3550 $self->realloc;
3551 });
3552 }
3553 }
3554 }
3555
3556 ($self->{size_w} || 8, $self->{size_h} || 8)
2739} 3557}
2740 3558
2741sub update { 3559sub update {
2742 my ($self) = @_; 3560 my ($self) = @_;
2743 3561
2744 return unless $self->{visible}; 3562 return unless $self->{visible};
2745 3563
2746 $self->SUPER::update; 3564 $self->SUPER::update;
2747} 3565}
2748 3566
3567sub invoke_visibility_change {
3568 my ($self) = @_;
3569
3570 $self->update_timer;
3571
3572 0
3573}
3574
2749sub _draw { 3575sub _draw {
2750 my ($self) = @_; 3576 my ($self) = @_;
2751 3577
2752 return unless $::CONN; 3578 $self->SUPER::_draw;
2753 3579
2754 my $face; 3580 if (my $tex = $self->{tex}) {
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 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
… …
3121 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
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 while ($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
3166 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
3167 } 4202 }
3168 }
3169 4203
3170 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
3172 values %$size_alloc; 4206 values %$size_alloc;
3173 4207
3174 while () { 4208 while () {
3175 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
3176 4210
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 4212
3179 $w = 0 if $w < 0; 4213 $w = max $widget->{min_w}, $w;
3180 $h = 0 if $h < 0; 4214 $h = max $widget->{min_h}, $h;
3181 4215
4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4218
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221
3182 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
3184 4224
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4226 $widget->{old_w} = $widget->{w};
4227 $widget->{old_h} = $widget->{h};
4228
3186 $widget->{w} = $w; 4229 $widget->{w} = $w;
3187 $widget->{h} = $h; 4230 $widget->{h} = $h;
3188 4231
3189 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
3190 } 4234 }
3191 } 4235 }
3192 } 4236 }
3193 4237
3194 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3195 $_->() 4239 $_->()
3196 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3197 } 4241 }
3198
3199 4242
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3203 4246
… …
3205 glLoadIdentity; 4248 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4250 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4251 glLoadIdentity;
3209 4252
4253 {
4254 package CFPlus::UI::Base;
4255
4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4257 (0, 0, $self->{w}, $self->{h});
4258
3210 $self->_draw; 4259 $self->_draw;
4260 }
3211} 4261}
3212 4262
3213############################################################################# 4263#############################################################################
3214 4264
3215package CFClient::UI::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; 4265package CFPlus::UI;
3393 4266
3394$ROOT = new CFClient::UI::Root; 4267$ROOT = new CFPlus::UI::Root;
3395$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3396 4269
33971 42701
3398 4271

Diff Legend

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