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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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