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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 74 if $FOCUS;
46} 75}
47 76
48sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 79 if $FOCUS;
51} 80}
52 81
53sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
54 my ($ev) = @_; 83 my ($ev) = @_;
… …
63 check_tooltip; 92 check_tooltip;
64 } 93 }
65 94
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 96
68 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 99}
73 100
74sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
75 my ($ev) = @_; 102 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
77 104
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 106
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 108
82 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 111
87 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 114 $grab->update if $grab;
90 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 132
108 check_tooltip; 133 check_tooltip;
109 } 134 }
110 135
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 137 if $HOVER;
115} 138}
116 139
117# convert position array to integers 140# convert position array to integers
118sub harmonize { 141sub harmonize {
119 my ($vals) = @_; 142 my ($vals) = @_;
… …
125 $rem += $_ - $i; 148 $rem += $_ - $i;
126 $_ = $i; 149 $_ = $i;
127 } 150 }
128} 151}
129 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $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};
180 $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.]+$/;
182 $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};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
130############################################################################# 194#############################################################################
131 195
132package CFClient::UI::Base; 196package CFClient::UI::Base;
133 197
134use strict; 198use strict;
… …
137 201
138sub new { 202sub new {
139 my $class = shift; 203 my $class = shift;
140 204
141 my $self = bless { 205 my $self = bless {
142 x => 0, 206 x => "center",
143 y => 0, 207 y => "center",
144 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
145 can_events => 1, 211 can_events => 1,
146 @_ 212 @_
147 }, $class; 213 }, $class;
148 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
149 for (keys %$self) { 217 for (keys %$self) {
150 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
152 } 220 }
153 } 221 }
154 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
155 $self 235 $self
156} 236}
157 237
158sub destroy { 238sub destroy {
159 my ($self) = @_; 239 my ($self) = @_;
… …
168 return if $self->{parent}; 248 return if $self->{parent};
169 249
170 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
171} 251}
172 252
173sub hide { 253sub set_visible {
174 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
175 277
176 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
178 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
179 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
180 if $self->{parent}; 312 if $self->{parent};
181} 313}
182 314
183sub move { 315sub move_abs {
184 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
185 317
186 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
189 321
190 $self->update; 322 $self->update;
191} 323}
192 324
193sub set_size { 325sub set_size {
194 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
195 327
196 $self->{user_w} = $w; 328 $self->{force_w} = $w;
197 $self->{user_h} = $h; 329 $self->{force_h} = $h;
198 330
199 $self->check_size; 331 $self->realloc;
200} 332}
201 333
202sub size_request { 334sub size_request {
203 require Carp; 335 require Carp;
204 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
206 338
207sub configure { 339sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
209 341
210 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
213 347
214 # use alignment to adjust x, y 348 # use alignment to adjust x, y
215 349
216 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 352 }
221 353
222 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 355 $self->{x} = $x;
224 $self->{y} = $y; 356 $self->{y} = $y;
225 $self->update; 357 $self->update;
226 } 358 }
227 359
228 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
229 $self->{w} = $w; 363 $self->{alloc_w} = $w;
230 $self->{h} = $h; 364 $self->{alloc_h} = $h;
231 365
232 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 367 }
235} 368}
236 369
237sub size_allocate { 370sub size_allocate {
238 # nothing to be done 371 # nothing to be done
… …
246 379
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 382}
250 383
251# return top left coordinates 384sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
254 386
255 $self->{parent} 387 $tooltip =~ s/^\s+//;
256 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
257 389
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
259} 398}
260 399
261# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
262sub coord2local { 401sub coord2local {
263 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
264 403
265 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 405}
268 406
269# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
270sub coord2global { 408sub coord2global {
271 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
272 410
273 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 412}
276 413
277sub focus_in { 414sub focus_in {
278 my ($self) = @_; 415 my ($self) = @_;
279 416
280 return if $FOCUS == $self; 417 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
282 419
283 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
284 421
285 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
286 423
287 $focus->update if $focus; 424 $focus->update if $focus;
288 $FOCUS->update; 425 $FOCUS->update;
289} 426}
290 427
… …
293 430
294 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
295 432
296 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
297 434
298 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
299 436
300 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
301} 441}
302 442
303sub mouse_motion { } 443sub mouse_motion { }
304sub button_up { } 444sub button_up { }
305sub key_down { } 445sub key_down { }
306sub key_up { } 446sub key_up { }
307 447
308sub button_down { 448sub button_down {
309 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
310 450
311 $self->focus_in; 451 $self->focus_in;
… …
314sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
315sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
316sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
317sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
318sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
319 529
320sub draw { 530sub draw {
321 my ($self) = @_; 531 my ($self) = @_;
322 532
323 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
340 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
341 glEnd; 551 glEnd;
342 glDisable GL_BLEND; 552 glDisable GL_BLEND;
343 } 553 }
344 554
345 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
346 glPushMatrix; 556 glPushMatrix;
347 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0; 560 glVertex 0 , 0;
351 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
352 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
353 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
354 glEnd; 564 glEnd;
355 glPopMatrix; 565 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 } 567 }
358} 568}
359 569
360sub _draw { 570sub _draw {
361 my ($self) = @_; 571 my ($self) = @_;
362 572
363 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
364} 574}
365 575
366sub find_widget {
367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
370
371 return $self
372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
374
375 ()
376}
377
378sub set_parent {
379 my ($self, $parent) = @_;
380
381 Scalar::Util::weaken ($self->{parent} = $parent);
382}
383
384sub check_size {
385 my ($self) = @_;
386
387 $self->{parent}
388 or return 1;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408}
409
410sub update {
411 my ($self) = @_;
412
413 $self->{parent}->update
414 if $self->{parent};
415}
416
417sub connect {
418 my ($self, $signal, $cb) = @_;
419
420 push @{ $self->{signal_cb}{$signal} }, $cb;
421}
422
423sub emit {
424 my ($self, $signal, @args) = @_;
425
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
427}
428
429sub DESTROY { 576sub DESTROY {
430 my ($self) = @_; 577 my ($self) = @_;
431 578
579 delete $WIDGET{$self+0};
432 #$self->deactivate; 580 #$self->deactivate;
433} 581}
434 582
435############################################################################# 583#############################################################################
436 584
… …
445 my $class = shift; 593 my $class = shift;
446 594
447 # range [value, low, high, page] 595 # range [value, low, high, page]
448 596
449 $class->SUPER::new ( 597 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
452 @_ 600 @_
453 ) 601 )
454} 602}
455 603
456sub _draw { 604sub _draw {
457 my ($self) = @_; 605 my ($self) = @_;
458 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
460 613
461 glEnable GL_BLEND; 614 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
464 617
465 glBegin GL_QUADS; 618 glBegin GL_QUADS;
466 glVertex 0 , 0; 619 glVertex 0 , 0;
467 glVertex 0 , $h; 620 glVertex 0 , $h;
468 glVertex $w, $h; 621 glVertex $w, $h;
469 glVertex $w, 0; 622 glVertex $w, 0;
470 glEnd; 623 glEnd;
471 624
472 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
473} 627}
474 628
475############################################################################# 629#############################################################################
476 630
477package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
482 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
484} 638}
485 639
486sub size_request { 640sub size_request {
487 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
488} 644}
489 645
490sub draw { } 646sub draw { }
491 647
492############################################################################# 648#############################################################################
… …
509 665
510 $self 666 $self
511} 667}
512 668
513sub add { 669sub add {
514 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
515 671
516 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
517 674
518 use sort 'stable'; 675 use sort 'stable';
519 676
520 $self->{children} = [ 677 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
523 ]; 680 ];
524 681
525 $child->check_size; 682 $self->realloc;
526} 683}
527 684
528sub children { 685sub children {
529 @{ $_[0]{children} } 686 @{ $_[0]{children} }
530} 687}
… …
535 delete $child->{parent}; 692 delete $child->{parent};
536 $child->hide; 693 $child->hide;
537 694
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539 696
540 $self->check_size; 697 $self->realloc;
541 $self->update;
542} 698}
543 699
544sub clear { 700sub clear {
545 my ($self) = @_; 701 my ($self) = @_;
546 702
… …
549 705
550 for (@$children) { 706 for (@$children) {
551 delete $_->{parent}; 707 delete $_->{parent};
552 $_->hide; 708 $_->hide;
553 } 709 }
710
711 $self->realloc;
554} 712}
555 713
556sub find_widget { 714sub find_widget {
557 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
558 716
… …
633} 791}
634 792
635sub update { 793sub update {
636 my ($self) = @_; 794 my ($self) = @_;
637 795
638 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 797 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 798}
652 799
653sub size_allocate { 800sub size_allocate {
654 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
655 802
656 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
657 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
658 $self->render_chld; 818 $self->_render;
819 };
659} 820}
660 821
661sub _draw { 822sub _draw {
662 my ($self) = @_; 823 my ($self) = @_;
663 824
664 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
665 826
666 my $tex = $self->{texture} 827 my $tex = $self->{texture}
667 or return; 828 or return;
668 829
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
673 833
674 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 835
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
678} 837}
679 838
680############################################################################# 839#############################################################################
681 840
682package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
683 842
684our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
706package CFClient::UI::Frame;
707
708our @ISA = CFClient::UI::Bin::;
709
710use CFClient::OpenGL;
711 844
712sub new { 845sub new {
713 my $class = shift; 846 my $class = shift;
714 847
715 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
716 bg => [1, 1, 1, 1], 849 scroll_x => 0,
717 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
718 border => 0.8,
719 @_ 851 @_,
720 ); 852 )
721
722 $self
723} 853}
724 854
725sub _draw { 855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
726 my ($self) = @_; 867 my ($self, $w, $h) = @_;
727 868
728 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
729 870
730 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 873
735# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
736# glColor 0, 0, 0, 0; 875 $self->update;
737# glVertex 0 , 0; 876}
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
743 880
744 $self->child->draw; 881 $self->{view_x} = int $x;
745 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
746 glDisable GL_TEXTURE_2D; 883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
747} 921}
748 922
749############################################################################# 923#############################################################################
750 924
751package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
752 926
753our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
754
755use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760 928
761sub new { 929sub new {
762 my $class = shift; 930 my $class = shift;
763 931
764 # TODO: user_x, user_y, overwrite moveto? 932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
765 1035
766 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
769 border => 0.8, 1039 border => 0.6,
770 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
771 @_ 1043 @_
772 ); 1044 );
773 1045
774 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 1047 align => 0,
776 valign => 1, 1048 valign => 1,
777 text => $self->{title}, 1049 text => $self->{title},
778 fontsize => 1; 1050 fontsize => $self->{border};
779 1051
780 $self 1052 $self
781} 1053}
782 1054
783sub border { 1055sub border {
… …
799 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
800 1072
801 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
803 1075
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
805 if $self->{title}; 1077 if $self->{title};
806 1078
807 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
808} 1080}
809 1081
810sub button_down { 1082sub button_down {
811 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
812 1084
1085 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 1086 my $border = $self->border;
814 1087
815 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
820 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
821 $self->{motion} = sub { 1099 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
823 1101
824 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
825 1104
826 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
828 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
829 }; 1110 };
830 1111
831 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
836 1115
837 $self->{motion} = sub { 1116 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
839 1118
840 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
841 1120
842 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
843 $self->update;
844 }; 1122 };
845 } 1123 }
846} 1124}
847 1125
848sub button_up { 1126sub button_up {
… …
861 my ($self) = @_; 1139 my ($self) = @_;
862 1140
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 1143
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1146
871 my $border = $self->border; 1147 my $border = $self->border;
872 1148
873 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1154
879 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
880 1157
881 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
883 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
884 1161 $bg->{t} = $ch / $bg->{h};
885 glColor @{ $self->{bg} };
886
887 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
891 1164
892 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1166
895 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
896 $self->child->draw; 1169 $self->child->draw;
897} 1170}
898 1171
899############################################################################# 1172#############################################################################
900 1173
… …
909sub new { 1182sub new {
910 my $class = shift; 1183 my $class = shift;
911 1184
912 $class->SUPER::new ( 1185 $class->SUPER::new (
913 col_expand => [], 1186 col_expand => [],
914 @_ 1187 @_,
915 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
916} 1193}
917 1194
918sub add { 1195sub add {
919 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
920 1197
921 $child->set_parent ($self); 1198 $child->set_parent ($self);
922 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
923 1200
924 $child->check_size; 1201 $self->realloc;
925} 1202}
926 1203
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
931# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
932sub clear { 1205sub clear {
933 my ($self) = @_; 1206 my ($self) = @_;
934 1207
935 my @children = $self->children; 1208 my @children = $self->children;
936 delete $self->{children}; 1209 delete $self->{children};
… …
938 for (@children) { 1211 for (@children) {
939 delete $_->{parent}; 1212 delete $_->{parent};
940 $_->hide; 1213 $_->hide;
941 } 1214 }
942 1215
943 $self->update; 1216 $self->realloc;
944} 1217}
945 1218
946sub get_wh { 1219sub get_wh {
947 my ($self) = @_; 1220 my ($self) = @_;
948 1221
… …
979sub size_allocate { 1252sub size_allocate {
980 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
981 1254
982 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
983 1256
984 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
985 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
986 1259
987 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
988 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
989 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
990 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1044 } 1317 }
1045} 1318}
1046 1319
1047############################################################################# 1320#############################################################################
1048 1321
1049package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1050
1051# TODO: wrap into common Box base class
1052 1323
1053our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1054 1325
1055sub size_request { 1326sub size_request {
1056 my ($self) = @_; 1327 my ($self) = @_;
1057 1328
1058 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1059 1330 ? (
1060 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1061 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1062 (List::Util::max map $_->[1], @alloc), 1333 )
1063 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1064} 1338}
1065 1339
1066sub size_allocate { 1340sub size_allocate {
1067 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1068 1342
1069 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1070
1071 my $children = $self->{children}; 1344 my $children = $self->{children};
1072 1345
1073 my @h = map $_->{req_w}, @$children; 1346 my @req;
1074 1347
1075 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1076 1349 @req = ($space / (@$children || 1)) x @$children;
1077 if ($req_h > $h) {
1078 # ah well, not enough space
1079 $_ *= $h / $req_h for @h;
1080 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1081 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1082 $exp ||= 1;
1083 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1084 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1085 my $child = $children->[$_];
1086
1087 my $alloc_h = $h[$_];
1088 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1089 $h[$_] = $alloc_h;
1090 } 1364 }
1091 } 1365 }
1092 1366
1093 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1094 1368
1095 my $y = 0; 1369 my $pos = 0;
1096 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1097 my $child = $children->[$_];
1098 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1099 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1100 1373
1101 $y += $h; 1374 $pos += $alloc;
1102 } 1375 }
1103 1376
1104 1 1377 1
1105} 1378}
1106 1379
1107############################################################################# 1380#############################################################################
1108 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1109package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1110 1398
1111# TODO: wrap into common Box base class
1112
1113our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1114 1400
1115sub size_request { 1401sub new {
1116 my ($self) = @_; 1402 my $class = shift;
1117 1403
1118 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1119 1405 vertical => 1,
1120 ( 1406 @_,
1121 (List::Util::max map $_->[0], @alloc),
1122 (List::Util::sum map $_->[1], @alloc),
1123 ) 1407 )
1124} 1408}
1125 1409
1126sub size_allocate {
1127 my ($self, $w, $h) = @_;
1128
1129 my $children = $self->{children};
1130
1131 my @h = map $_->{req_h}, @$children;
1132
1133 my $req_h = List::Util::sum @h;
1134
1135 if ($req_h > $h) {
1136 # ah well, not enough space
1137 $_ *= $h / $req_h for @h;
1138 } else {
1139 my $exp = List::Util::sum map $_->{expand}, @$children;
1140 $exp ||= 1;
1141
1142 for (0 .. $#$children) {
1143 my $child = $children->[$_];
1144
1145 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1146 }
1147 }
1148
1149 CFClient::UI::harmonize \@h;
1150
1151 my $y = 0;
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154 my $h = $h[$_];
1155 $child->configure (0, $y, $w, $h);
1156
1157 $y += $h;
1158 }
1159
1160 1
1161}
1162
1163############################################################################# 1410#############################################################################
1164 1411
1165package CFClient::UI::Label; 1412package CFClient::UI::Label;
1166 1413
1167our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1168 1415
1169use CFClient::OpenGL; 1416use CFClient::OpenGL;
1170 1417
1171sub new { 1418sub new {
1172 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1173 1420
1174 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1176 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1177 fontsize => 1, 1431 fontsize => 1,
1178 text => "",
1179 align => -1, 1432 align => -1,
1180 valign => -1, 1433 valign => -1,
1181 padding => 2, 1434 padding_x => 2,
1182 layout => new CFClient::Layout, 1435 padding_y => 2,
1183 can_events => 0, 1436 can_events => 0,
1184 %arg 1437 %arg
1185 ); 1438 );
1186 1439
1187 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1443 $self->{template} = $layout;
1191 } 1444 }
1192 1445
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1195 1451
1196 $self 1452 $self
1197} 1453}
1198 1454
1199sub escape { 1455sub escape($) {
1200 local $_ = $_[1]; 1456 local $_ = $_[0];
1201 1457
1202 s/&/&amp;/g; 1458 s/&/&amp;/g;
1203 s/>/&gt;/g; 1459 s/>/&gt;/g;
1204 s/</&lt;/g; 1460 s/</&lt;/g;
1205 1461
1206 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1207} 1470}
1208 1471
1209sub set_text { 1472sub set_text {
1210 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1211 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1213 1480
1214 delete $self->{texture}; 1481 $self->realloc;
1215 $self->check_size;
1216 $self->update; 1482 $self->update;
1217} 1483}
1218 1484
1219sub set_markup { 1485sub set_markup {
1220 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1221 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1223 1495
1224 delete $self->{texture}; 1496 $self->realloc;
1225 $self->check_size;
1226 $self->update; 1497 $self->update;
1227} 1498}
1228 1499
1229sub size_request { 1500sub size_request {
1230 my ($self) = @_; 1501 my ($self) = @_;
1231 1502
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1508
1236 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1237 1510
1238 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1243 1516
1244 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1245 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1246 } 1519 }
1247 1520
1248 ( 1521 ($w, $h)
1249 $w + $self->{padding} * 2,
1250 $h + $self->{padding} * 2,
1251 )
1252} 1522}
1253 1523
1254sub size_allocate { 1524sub size_allocate {
1255 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1256 1526
1257 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1258} 1529}
1259 1530
1260sub set_fontsize { 1531sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1262 1533
1263 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1535 delete $self->{texture};
1265 $self->check_size; 1536
1266 $self->update; 1537 $self->realloc;
1267} 1538}
1268 1539
1269sub _draw { 1540sub _draw {
1270 my ($self) = @_; 1541 my ($self) = @_;
1271 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1272 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1276 new_from_layout CFClient::Texture $self->{layout} 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1554
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5);
1558
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1277 }; 1564 };
1278 1565
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1568
1569 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $tex->draw_quad ($self->{ox}, $self->{oy}); 1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 }
1299 1575
1300 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1577}
1303 1578
1304############################################################################# 1579#############################################################################
1305 1580
1306package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1320 can_hover => 1, 1595 can_hover => 1,
1321 can_focus => 1, 1596 can_focus => 1,
1322 valign => 0, 1597 valign => 0,
1323 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1324 @_ 1600 @_
1325 ) 1601 )
1326} 1602}
1327 1603
1328sub _set_text { 1604sub _set_text {
… …
1338 $self->{text} = $text; 1614 $self->{text} = $text;
1339 1615
1340 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1342 1618
1343 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1620}
1621
1622sub set_text {
1623 my ($self, $text) = @_;
1624
1625 $self->{cursor} = length $text;
1626 $self->_set_text ($text);
1627
1628 $self->realloc;
1344} 1629}
1345 1630
1346sub get_text { 1631sub get_text {
1347 $_[0]{text} 1632 $_[0]{text}
1348} 1633}
… …
1351 my ($self) = @_; 1636 my ($self) = @_;
1352 1637
1353 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1354 1639
1355 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1641}
1371 1642
1372sub key_down { 1643sub key_down {
1373 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1374 1645
… …
1376 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1378 1649
1379 my $text = $self->get_text; 1650 my $text = $self->get_text;
1380 1651
1381 if ($sym == 8) { 1652 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1665 $self->_emit ('escape');
1395 } elsif ($uni) { 1666 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1668 }
1398 1669
1399 $self->_set_text ($text); 1670 $self->_set_text ($text);
1400 $self->update; 1671
1672 $self->realloc;
1401} 1673}
1402 1674
1403sub focus_in { 1675sub focus_in {
1404 my ($self) = @_; 1676 my ($self) = @_;
1405 1677
… …
1485 if ($sym == 13) { 1757 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1491 $self->update; 1763 $self->update;
1492 1764
1493 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1532 1804
1533sub new { 1805sub new {
1534 my $class = shift; 1806 my $class = shift;
1535 1807
1536 $class->SUPER::new ( 1808 $class->SUPER::new (
1537 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1538 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1541 can_hover => 1, 1813 can_hover => 1,
1542 align => 0, 1814 align => 0,
1543 valign => 0, 1815 valign => 0,
1544 can_events => 1, 1816 can_events => 1,
1545 @_ 1817 @_
1546 ) 1818 )
1547} 1819}
1548 1820
1821sub activate { }
1822
1549sub button_up { 1823sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1551 1825
1826 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate");
1555 }
1556} 1829}
1557 1830
1558sub _draw { 1831sub _draw {
1559 my ($self) = @_; 1832 my ($self) = @_;
1560 1833
… …
1562 1835
1563 if ($GRAB == $self) { 1836 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1837 $self->{fg} = $self->{active_fg};
1565 } 1838 }
1566 1839
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1840 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1842 glColor 0, 0, 0, 1;
1572 1843
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1845
1575 glDisable GL_TEXTURE_2D; 1846 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1847
1578 $self->SUPER::_draw; 1848 $self->SUPER::_draw;
1579} 1849}
1580 1850
1581############################################################################# 1851#############################################################################
… …
1592 1862
1593sub new { 1863sub new {
1594 my $class = shift; 1864 my $class = shift;
1595 1865
1596 $class->SUPER::new ( 1866 $class->SUPER::new (
1597 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1598 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1599 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1871 bg => [0, 0, 0, 0.2],
1872 active_bg => [1, 1, 1, 0.5],
1600 state => 0, 1873 state => 0,
1601 can_hover => 1, 1874 can_hover => 1,
1602 @_ 1875 @_
1603 ) 1876 )
1604} 1877}
1605 1878
1606sub size_request { 1879sub size_request {
1607 my ($self) = @_; 1880 my ($self) = @_;
1608 1881
1609 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1610} 1883}
1611 1884
1612sub button_down { 1885sub button_down {
1613 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1614 1887
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1617 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1619 } 1892 }
1620} 1893}
1621 1894
1622sub _draw { 1895sub _draw {
1623 my ($self) = @_; 1896 my ($self) = @_;
1624 1897
1625 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1626 1899
1627 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1628 1901
1629 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1630 1905
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1907
1633 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1634 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1913}
1644 1914
1645############################################################################# 1915#############################################################################
1646 1916
1647package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1691 1961
1692 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1693 } 1963 }
1694 1964
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1967
1700 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1969
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1704} 1971}
1705 1972
1706############################################################################# 1973#############################################################################
1707 1974
… …
1755} 2022}
1756 2023
1757sub set_max { 2024sub set_max {
1758 my ($self, $max) = @_; 2025 my ($self, $max) = @_;
1759 2026
2027 return if $self->{max_val} == $max;
2028
1760 $self->{max_val} = $max; 2029 $self->{max_val} = $max;
2030 $self->update;
1761} 2031}
1762 2032
1763sub set_value { 2033sub set_value {
1764 my ($self, $val, $max) = @_; 2034 my ($self, $val, $max) = @_;
1765 2035
1766 $self->set_max ($max) 2036 $self->set_max ($max)
1767 if defined $max; 2037 if defined $max;
1768 2038
1769 $max = $self->{max_val}; 2039 return if $self->{val} == $val;
2040
1770 $self->{val} = $val; 2041 $self->{val} = $val;
1771
1772 $self->update; 2042 $self->update;
1773} 2043}
1774 2044
1775sub _draw { 2045sub _draw {
1776 my ($self) = @_; 2046 my ($self) = @_;
… …
1859 2129
1860 $self->{value}->set_fontsize ($fsize); 2130 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2131 $self->{max} ->set_fontsize ($fsize);
1862} 2132}
1863 2133
2134sub set_max {
2135 my ($self, $max) = @_;
2136
2137 $self->{gauge}->set_max ($max);
2138 $self->{max}->set_text ($max);
2139}
2140
1864sub set_value { 2141sub set_value {
1865 my ($self, $val, $max) = @_; 2142 my ($self, $val, $max) = @_;
1866 2143
1867 $self->set_max ($max) 2144 $self->set_max ($max)
1868 if defined $max; 2145 if defined $max;
1869 2146
1870 $self->{gauge}->set_value ($val, $max); 2147 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2148 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2149}
1880 2150
1881############################################################################# 2151#############################################################################
1882 2152
1883package CFClient::UI::Slider; 2153package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1894 2164
1895sub new { 2165sub new {
1896 my $class = shift; 2166 my $class = shift;
1897 2167
1898 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1899 2169
1900 # TODO: 0-width page 2170 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2172 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
1906 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2179 min_w => $::WIDTH / 80,
1908 req_h => 20, 2180 min_h => $::WIDTH / 80,
1909 vertical => 0, 2181 vertical => 0,
1910 can_hover => 1, 2182 can_hover => 1,
1911 inner_pad => 5, 2183 inner_pad => 0.02,
1912 @_ 2184 @_
1913 ); 2185 );
1914 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1915 $self 2190 $self
1916} 2191}
1917 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2204sub set_value {
2205 my ($self, $value) = @_;
2206
2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2208
2209 $hi = $lo + 1 if $hi <= $lo;
2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2213 $value = $lo if $value < $lo;
2214 $value = $hi - $page if $value > $hi - $page;
2215
2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2217 if $unit;
2218
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220
2221 if ($value != $old_value) {
2222 $self->_emit (changed => $value);
2223 $self->update;
2224 }
2225}
2226
1918sub size_request { 2227sub size_request {
1919 my ($self) = @_; 2228 my ($self) = @_;
1920 2229
1921 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1922 my $h = $self->{req_h};
1923
1924 $self->{vertical} ? ($h, $w) : ($w, $h)
1925} 2231}
1926 2232
1927sub button_down { 2233sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1929 2235
1930 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
1931 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1932} 2241}
1933 2242
1934sub mouse_motion { 2243sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1936 2245
1937 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248
2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2254 }
2255}
2256
2257sub update {
2258 my ($self) = @_;
2259
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2261 $self->set_value ($self->{range}[0]);
2262
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
1939 2265
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2267
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2270
1945 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2273
1951 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2275 $self->{knob_w} = $knob_w;
1953 } 2276 });
1954}
1955 2277
1956# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2279}
1963 2280
1964sub _draw { 2281sub _draw {
1965 my ($self) = @_; 2282 my ($self) = @_;
1966 2283
1967 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
1968 2285
1969 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
1970 2287
1971 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
1973 2290
2291 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2293 }
1979 2294
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2297
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2300
2006 # draw background 2301 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2303
2009 # draw handle 2304 # draw handle
2010 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011 2306
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2014} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2015 2350
2016############################################################################# 2351#############################################################################
2017 2352
2018package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2019 2354
… …
2028 fontsize => 1, 2363 fontsize => 1,
2029 can_events => 0, 2364 can_events => 0,
2030 #font => default_font 2365 #font => default_font
2031 @_, 2366 @_,
2032 2367
2033 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
2034 par => [], 2369 par => [],
2035 height => 0, 2370 height => 0,
2036 children => [ 2371 children => [
2037 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
2039 ], 2374 ],
2040 ); 2375 );
2041 2376
2042 $self->{children}[1]->connect (changed => sub { 2377 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2378
2046 $self 2379 $self
2047} 2380}
2048 2381
2049sub set_fontsize { 2382sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2383 my ($self, $fontsize) = @_;
2051 2384
2052 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2386 $self->reflow;
2054}
2055
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073} 2387}
2074 2388
2075sub size_allocate { 2389sub size_allocate {
2076 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2077 2391
… …
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2397
2084 $self->reflow; 2398 $self->reflow;
2085} 2399}
2086 2400
2401sub text_size {
2402 my ($self, $text, $indent) = @_;
2403
2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2408 $layout->set_markup ($text);
2409
2410 $layout->size
2411}
2412
2413sub reflow {
2414 my ($self) = @_;
2415
2416 $self->{need_reflow}++;
2417 $self->update;
2418}
2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
2087sub add_paragraph { 2435sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2089 2437
2090 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2091 2439 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2095 2443
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2099 $self->{children}[1]->update;
2100} 2445}
2101 2446
2102sub update { 2447sub update {
2103 my ($self) = @_; 2448 my ($self) = @_;
2104 2449
… …
2106 2451
2107 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2108 2453
2109 delete $self->{texture}; 2454 delete $self->{texture};
2110 2455
2111 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2112 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2460 my $height = 0;
2114 2461
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2116 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2117 2477
2118 $self->{height} = $height; 2478 $self->{height} = $height;
2119 2479
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2481
2122 delete $self->{texture}; 2482 delete $self->{texture};
2123 } 2483 }
2124 2484
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2128 2488
2489 my $top = int $self->{children}[1]{range}[0];
2490
2491 my $y0 = $top;
2492 my $y1 = $top + $H;
2493
2494 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
2129 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2503
2145 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2505 my $h = $par->[1];
2147 2506
2148 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2149 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2150 2511
2151 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2513
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154 } 2516 }
2155 2517
2156 $y += $h; 2518 $y += $h;
2157 } 2519 }
2158 2520
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
2161 }; 2522 };
2162 }); 2523 });
2163} 2524}
2164 2525
2165sub _draw { 2526sub _draw {
2166 my ($self) = @_; 2527 my ($self) = @_;
2167 2528
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2174 }
2175 2534
2176 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2177 2536
2178} 2537}
2179 2538
… …
2227 2586
2228sub new { 2587sub new {
2229 my $class = shift; 2588 my $class = shift;
2230 2589
2231 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2232 state => 0, 2591 state => 0,
2233 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2234 @_ 2593 @_
2235 ); 2594 );
2236 2595
2237 if ($self->{state}) {
2238 $self->{state} = 0;
2239 $self->toggle_flopper;
2240 }
2241
2242 $self 2596 $self
2243} 2597}
2244 2598
2245sub toggle_flopper { 2599sub toggle_flopper {
2246 my ($self) = @_; 2600 my ($self) = @_;
2247 2601
2248 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2249 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open");
2253 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close");
2256 }
2257
2258 $self->emit (changed => $self->{state});
2259} 2603}
2260 2604
2261############################################################################# 2605#############################################################################
2262 2606
2263package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2273 @_, 2617 @_,
2274 can_events => 0, 2618 can_events => 0,
2275 ) 2619 )
2276} 2620}
2277 2621
2278sub set_markup { 2622sub set_tooltip_from {
2279 my ($self, $text) = @_; 2623 my ($self, $widget) = @_;
2280 2624
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2625 my $tooltip = $widget->{tooltip};
2282 $self->{label}->set_markup ($text); 2626
2283 $self->add ($self->{label}); 2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2634 $self->add (new CFClient::UI::Label
2635 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8,
2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 );
2284} 2642}
2285 2643
2286sub size_request { 2644sub size_request {
2287 my ($self) = @_; 2645 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2646
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2648
2293 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2294} 2650}
… …
2297 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2298 2654
2299 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300} 2656}
2301 2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2674}
2675
2302sub _draw { 2676sub _draw {
2303 my ($self) = @_; 2677 my ($self) = @_;
2304 2678
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2679 glTranslate 0.375, 0.375;
2307 2680
2308 my ($w, $h) = @$self{qw(w h)}; 2681 my ($w, $h) = @$self{qw(w h)};
2309 2682
2310 glColor 1, 0.8, 0.4; 2683 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2694 glVertex 0 , $h;
2322 glVertex $w, $h; 2695 glVertex $w, $h;
2323 glVertex $w, 0; 2696 glVertex $w, 0;
2324 glEnd; 2697 glEnd;
2325 2698
2326 glPopMatrix; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2327 2700
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2330} 2702}
2331 2703
2332############################################################################# 2704#############################################################################
2333 2705
… …
2338use CFClient::OpenGL; 2710use CFClient::OpenGL;
2339 2711
2340sub new { 2712sub new {
2341 my $class = shift; 2713 my $class = shift;
2342 2714
2343 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2344 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2345 @_, 2718 @_,
2346 ) 2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2347} 2736}
2348 2737
2349sub size_request { 2738sub size_request {
2350 (32, 8) 2739 (32, 8)
2351} 2740}
2352 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2353sub draw { 2750sub _draw {
2354 my ($self) = @_; 2751 my ($self) = @_;
2355 2752
2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2765
2358 if ($tex) { 2766 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2368} 2782}
2369 2783
2370############################################################################# 2784#############################################################################
2371 2785
2786package CFClient::UI::Menu;
2787
2788our @ISA = CFClient::UI::FancyFrame::;
2789
2790use CFClient::OpenGL;
2791
2792sub new {
2793 my $class = shift;
2794
2795 my $self = $class->SUPER::new (
2796 items => [],
2797 z => 100,
2798 @_,
2799 );
2800
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802
2803 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item;
2805
2806 # handle various types of items, only text for now
2807 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label
2809 can_hover => 1,
2810 can_events => 1,
2811 text => $widget;
2812 }
2813
2814 $self->{item}{$widget} = $item;
2815
2816 $self->{vbox}->add ($widget);
2817 }
2818
2819 $self
2820}
2821
2822# popup given the event (must be a mouse button down event currently)
2823sub popup {
2824 my ($self, $ev) = @_;
2825
2826 $self->_emit ("popdown");
2827
2828 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self;
2830 $self->{button} = $ev->{button};
2831
2832 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834}
2835
2836sub mouse_motion {
2837 my ($self, $ev, $x, $y) = @_;
2838
2839 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER};
2842}
2843
2844sub button_up {
2845 my ($self, $ev, $x, $y) = @_;
2846
2847 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB;
2849 $self->hide;
2850
2851 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover};
2853 }
2854}
2855
2856#############################################################################
2857
2858package CFClient::UI::Statusbox;
2859
2860our @ISA = CFClient::UI::VBox::;
2861
2862sub new {
2863 my $class = shift;
2864
2865 $class->SUPER::new (
2866 fontsize => 0.8,
2867 @_,
2868 )
2869}
2870
2871sub reorder {
2872 my ($self) = @_;
2873 my $NOW = time;
2874
2875 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 }
2878
2879 my @widgets;
2880
2881 my @items = sort {
2882 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} };
2885
2886 my $count = 10 + 1;
2887 for my $item (@items) {
2888 last unless --$count;
2889
2890 push @widgets, $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text};
2895
2896 for ($short) {
2897 s/^\s+//;
2898 s/\s+/ /g;
2899 }
2900
2901 new CFClient::UI::Label
2902 markup => $short,
2903 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg},
2909 can_events => 1,
2910 can_hover => 1
2911 };
2912 }
2913
2914 $self->clear;
2915 $self->SUPER::add (reverse @widgets);
2916}
2917
2918sub add {
2919 my ($self, $text, %arg) = @_;
2920
2921 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2925
2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2927
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929
2930 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) {
2932 $item->{count}++;
2933 } else {
2934 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text;
2936 }
2937 $item->{id} = ++$self->{id};
2938 $item->{timeout} = $timeout;
2939 delete $item->{label};
2940 } else {
2941 $self->{item}{$group} = {
2942 id => ++$self->{id},
2943 text => $text,
2944 timeout => $timeout,
2945 tooltip => $text,
2946 fg => [0.8, 0.8, 0.8, 0.8],
2947 pri => 0,
2948 count => 1,
2949 %arg,
2950 };
2951 }
2952
2953 $self->reorder;
2954}
2955
2956sub reconfigure {
2957 my ($self) = @_;
2958
2959 delete $_->{label}
2960 for values %{ $self->{item} || {} };
2961
2962 $self->reorder;
2963 $self->SUPER::reconfigure;
2964}
2965
2966#############################################################################
2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2372package CFClient::UI::Root; 3259package CFClient::UI::Root;
2373 3260
2374our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2375 3262
2376use CFClient::OpenGL; 3263use CFClient::OpenGL;
2377 3264
2378sub check_size { 3265sub new {
2379 my ($self) = @_; 3266 my $class = shift;
2380 3267
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
2382} 3276}
2383 3277
2384sub size_request { 3278sub size_request {
2385 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
2386}
2387 3280
2388sub configure { 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
3296}
3297
3298sub size_allocate {
2389 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2390 3300
2391 $self->SUPER::configure ($x, $y, $w, $h);
2392
2393 for my $child (@{$self->{children}}) { 3301 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 3303
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3304 $X = $child->{force_x} if exists $child->{force_x};
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3305 $Y = $child->{force_y} if exists $child->{force_y};
3306
3307 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h};
3309
2398 $child->configure ($X, $Y, $W,$H); 3310 $child->configure ($X, $Y, $W, $H);
2399 } 3311 }
2400} 3312}
2401 3313
2402sub _topleft { 3314sub coord2local {
2403 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2404 3316
2405 ($x, $y) 3317 ($x, $y)
2406} 3318}
2407 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2408sub update { 3326sub update {
2409 my ($self) = @_; 3327 my ($self) = @_;
2410 3328
2411 $self->check_size; 3329 $::WANT_REFRESH++;
2412 ::refresh ();
2413} 3330}
2414 3331
2415sub add { 3332sub add {
2416 my ($self, $child) = @_; 3333 my ($self, @children) = @_;
2417 3334
2418 # integerize window positions 3335 $_->{is_toplevel} = 1
2419 $child->{x} = int $child->{x}; 3336 for @children;
2420 $child->{y} = int $child->{y};
2421 3337
2422 $self->SUPER::add ($child); 3338 $self->SUPER::add (@children);
3339}
3340
3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
2423} 3354}
2424 3355
2425sub on_refresh { 3356sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2427 3358
2428 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2429} 3360}
2430 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2431sub draw { 3368sub draw {
2432 my ($self) = @_; 3369 my ($self) = @_;
2433 3370
2434 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2436 } 3374 }
3375
3376 if ($self->{realloc}) {
3377 my @queue;
3378
3379 while () {
3380 if ($self->{realloc}) {
3381 #TODO use array-of-depth approach
3382
3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
3387 }
3388
3389 my $widget = pop @queue || last;
3390
3391 $widget->{visible} or last; # do not resize invisible widgets
3392
3393 my ($w, $h) = $widget->size_request;
3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3403 $widget->{req_w} = $w;
3404 $widget->{req_h} = $h;
3405
3406 $self->{size_alloc}{$widget+0} = $widget;
3407
3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3417 }
3418 }
3419
3420 while (my $size_alloc = delete $self->{size_alloc}) {
3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428
3429 $w = 0 if $w < 0;
3430 $h = 0 if $h < 0;
3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3436 $widget->{w} = $w;
3437 $widget->{h} = $h;
3438
3439 $widget->emit (size_allocate => $w, $h);
3440 }
3441 }
3442 }
3443
3444 while ($self->{post_alloc_hook}) {
3445 $_->()
3446 for values %{delete $self->{post_alloc_hook}};
3447 }
3448
2437 3449
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2441 3453
2442 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3455 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3458 glLoadIdentity;
2447 3459
2448 $self->_draw; 3460 $self->_draw;
2449} 3461}
… …
2451############################################################################# 3463#############################################################################
2452 3464
2453package CFClient::UI; 3465package CFClient::UI;
2454 3466
2455$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3469
24581 34701
2459 3471

Diff Legend

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