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

Diff Legend

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