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.173 by root, Tue Apr 25 10:30:48 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
239} 372}
240 373
241sub children { 374sub children {
242} 375}
243 376
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size { 377sub set_max_size {
255 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
256 379
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 382}
260 383
261# return top left coordinates 384sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
264 386
265 $self->{parent} 387 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
267 389
268 $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 }
269} 398}
270 399
271# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
272sub coord2local { 401sub coord2local {
273 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
274 403
275 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 405}
278 406
279# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
280sub coord2global { 408sub coord2global {
281 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
282 410
283 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 412}
286 413
287sub focus_in { 414sub focus_in {
288 my ($self) = @_; 415 my ($self) = @_;
289 416
290 return if $FOCUS == $self; 417 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
292 419
293 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
294 421
295 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
296 423
297 $focus->update if $focus; 424 $focus->update if $focus;
298 $FOCUS->update; 425 $FOCUS->update;
299} 426}
300 427
… …
303 430
304 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
305 432
306 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
307 434
308 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
309 436
310 $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;
311} 441}
312 442
313sub mouse_motion { } 443sub mouse_motion { }
314sub button_up { } 444sub button_up { }
315sub key_down { } 445sub key_down { }
316sub key_up { } 446sub key_up { }
317 447
318sub button_down { 448sub button_down {
319 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
320 450
321 $self->focus_in; 451 $self->focus_in;
… …
324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
328sub 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}
329 529
330sub draw { 530sub draw {
331 my ($self) = @_; 531 my ($self) = @_;
332 532
333 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
350 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
351 glEnd; 551 glEnd;
352 glDisable GL_BLEND; 552 glDisable GL_BLEND;
353 } 553 }
354 554
355 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
356 glPushMatrix; 556 glPushMatrix;
357 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 560 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
364 glEnd; 564 glEnd;
365 glPopMatrix; 565 glPopMatrix;
366 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;
367 } 567 }
368} 568}
369 569
370sub _draw { 570sub _draw {
371 my ($self) = @_; 571 my ($self) = @_;
372 572
373 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
374} 574}
375 575
376sub find_widget {
377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
385 ()
386}
387
388sub set_parent {
389 my ($self, $parent) = @_;
390
391 Scalar::Util::weaken ($self->{parent} = $parent);
392}
393
394sub check_size {
395 my ($self) = @_;
396
397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 576sub DESTROY {
440 my ($self) = @_; 577 my ($self) = @_;
441 578
579 delete $WIDGET{$self+0};
442 #$self->deactivate; 580 #$self->deactivate;
443} 581}
444 582
445############################################################################# 583#############################################################################
446 584
… …
455 my $class = shift; 593 my $class = shift;
456 594
457 # range [value, low, high, page] 595 # range [value, low, high, page]
458 596
459 $class->SUPER::new ( 597 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
462 @_ 600 @_
463 ) 601 )
464} 602}
465 603
466sub _draw { 604sub _draw {
467 my ($self) = @_; 605 my ($self) = @_;
468 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
470 613
471 glEnable GL_BLEND; 614 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
474 617
475 glBegin GL_QUADS; 618 glBegin GL_QUADS;
476 glVertex 0 , 0; 619 glVertex 0 , 0;
477 glVertex 0 , $h; 620 glVertex 0 , $h;
478 glVertex $w, $h; 621 glVertex $w, $h;
479 glVertex $w, 0; 622 glVertex $w, 0;
480 glEnd; 623 glEnd;
481 624
482 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
483} 627}
484 628
485############################################################################# 629#############################################################################
486 630
487package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
494} 638}
495 639
496sub size_request { 640sub size_request {
497 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
498} 644}
499 645
500sub draw { } 646sub draw { }
501 647
502############################################################################# 648#############################################################################
… …
519 665
520 $self 666 $self
521} 667}
522 668
523sub add { 669sub add {
524 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
525 671
526 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
527 674
528 use sort 'stable'; 675 use sort 'stable';
529 676
530 $self->{children} = [ 677 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
533 ]; 680 ];
534 681
535 $child->check_size; 682 $self->realloc;
536} 683}
537 684
538sub children { 685sub children {
539 @{ $_[0]{children} } 686 @{ $_[0]{children} }
540} 687}
… …
545 delete $child->{parent}; 692 delete $child->{parent};
546 $child->hide; 693 $child->hide;
547 694
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 696
550 $self->check_size; 697 $self->realloc;
551 $self->update;
552} 698}
553 699
554sub clear { 700sub clear {
555 my ($self) = @_; 701 my ($self) = @_;
556 702
… …
559 705
560 for (@$children) { 706 for (@$children) {
561 delete $_->{parent}; 707 delete $_->{parent};
562 $_->hide; 708 $_->hide;
563 } 709 }
710
711 $self->realloc;
564} 712}
565 713
566sub find_widget { 714sub find_widget {
567 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
568 716
… …
643} 791}
644 792
645sub update { 793sub update {
646 my ($self) = @_; 794 my ($self) = @_;
647 795
648 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 797 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 798}
662 799
663sub size_allocate { 800sub size_allocate {
664 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
665 802
666 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
667 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
668 $self->render_chld; 818 $self->_render;
819 };
669} 820}
670 821
671sub _draw { 822sub _draw {
672 my ($self) = @_; 823 my ($self) = @_;
673 824
674 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
675 826
676 my $tex = $self->{texture} 827 my $tex = $self->{texture}
677 or return; 828 or return;
678 829
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
682 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;
683 833
684 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 835
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
688} 837}
689 838
690############################################################################# 839#############################################################################
691 840
692package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
693 842
694our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 844
722sub new { 845sub new {
723 my $class = shift; 846 my $class = shift;
724 847
725 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
726 bg => [1, 1, 1, 1], 849 scroll_x => 0,
727 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
728 border => 0.8,
729 @_ 851 @_,
730 ); 852 )
731
732 $self
733} 853}
734 854
735sub _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 {
736 my ($self) = @_; 867 my ($self, $w, $h) = @_;
737 868
738 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
739 870
740 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 873
745# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
746# glColor 0, 0, 0, 0; 875 $self->update;
747# glVertex 0 , 0; 876}
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
753 880
754 $self->child->draw; 881 $self->{view_x} = int $x;
755 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
756 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;
757} 921}
758 922
759############################################################################# 923#############################################################################
760 924
761package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
762 926
763our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770 928
771sub new { 929sub new {
772 my $class = shift; 930 my $class = shift;
773 931
774 # 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;
775 1035
776 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1039 border => 0.6,
780 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
781 @_ 1043 @_
782 ); 1044 );
783 1045
784 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 1047 align => 0,
786 valign => 1, 1048 valign => 1,
787 text => $self->{title}, 1049 text => $self->{title},
788 fontsize => 1; 1050 fontsize => $self->{border};
789 1051
790 $self 1052 $self
791} 1053}
792 1054
793sub border { 1055sub border {
… …
809 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
810 1072
811 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
813 1075
814 $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)
815 if $self->{title}; 1077 if $self->{title};
816 1078
817 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
818} 1080}
819 1081
820sub button_down { 1082sub button_down {
821 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
822 1084
1085 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1086 my $border = $self->border;
824 1087
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
831 $self->{motion} = sub { 1099 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
833 1101
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
835 1104
836 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
838 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
839 }; 1110 };
840 1111
841 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
846 1115
847 $self->{motion} = sub { 1116 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
849 1118
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
851 1120
852 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
853 $self->update;
854 }; 1122 };
855 } 1123 }
856} 1124}
857 1125
858sub button_up { 1126sub button_up {
… …
871 my ($self) = @_; 1139 my ($self) = @_;
872 1140
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1143
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1146
881 my $border = $self->border; 1147 my $border = $self->border;
882 1148
883 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1154
889 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
890 1157
891 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
893 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
894 1161 $bg->{t} = $ch / $bg->{h};
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
901 1164
902 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1166
905 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
906 $self->child->draw; 1169 $self->child->draw;
907} 1170}
908 1171
909############################################################################# 1172#############################################################################
910 1173
… …
919sub new { 1182sub new {
920 my $class = shift; 1183 my $class = shift;
921 1184
922 $class->SUPER::new ( 1185 $class->SUPER::new (
923 col_expand => [], 1186 col_expand => [],
924 @_ 1187 @_,
925 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
926} 1193}
927 1194
928sub add { 1195sub add {
929 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
930 1197
931 $child->set_parent ($self); 1198 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
933 1200
934 $child->check_size; 1201 $self->realloc;
935} 1202}
936 1203
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# 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?
942sub clear { 1205sub clear {
943 my ($self) = @_; 1206 my ($self) = @_;
944 1207
945 my @children = $self->children; 1208 my @children = $self->children;
946 delete $self->{children}; 1209 delete $self->{children};
… …
948 for (@children) { 1211 for (@children) {
949 delete $_->{parent}; 1212 delete $_->{parent};
950 $_->hide; 1213 $_->hide;
951 } 1214 }
952 1215
953 $self->update; 1216 $self->realloc;
954} 1217}
955 1218
956sub get_wh { 1219sub get_wh {
957 my ($self) = @_; 1220 my ($self) = @_;
958 1221
… …
989sub size_allocate { 1252sub size_allocate {
990 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
991 1254
992 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
993 1256
994 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
996 1259
997 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
998 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1054 } 1317 }
1055} 1318}
1056 1319
1057############################################################################# 1320#############################################################################
1058 1321
1059package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1060
1061# TODO: wrap into common Box base class
1062 1323
1063our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1064 1325
1065sub size_request { 1326sub size_request {
1066 my ($self) = @_; 1327 my ($self) = @_;
1067 1328
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1069 1330 ? (
1070 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1071 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1072 (List::Util::max map $_->[1], @alloc), 1333 )
1073 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1074} 1338}
1075 1339
1076sub size_allocate { 1340sub size_allocate {
1077 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1078 1342
1079 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1080
1081 my $children = $self->{children}; 1344 my $children = $self->{children};
1082 1345
1083 my @h = map $_->{req_w}, @$children; 1346 my @req;
1084 1347
1085 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1086 1349 @req = ($space / (@$children || 1)) x @$children;
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } 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 {
1091 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1092 $exp ||= 1;
1093 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1094 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 } 1364 }
1101 } 1365 }
1102 1366
1103 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1104 1368
1105 my $y = 0; 1369 my $pos = 0;
1106 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1109 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1110 1373
1111 $y += $h; 1374 $pos += $alloc;
1112 } 1375 }
1113 1376
1114 1 1377 1
1115} 1378}
1116 1379
1117############################################################################# 1380#############################################################################
1118 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
1119package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1120 1398
1121# TODO: wrap into common Box base class
1122
1123our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1124 1400
1125sub size_request { 1401sub new {
1126 my ($self) = @_; 1402 my $class = shift;
1127 1403
1128 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1129 1405 vertical => 1,
1130 ( 1406 @_,
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1407 )
1134} 1408}
1135 1409
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1410#############################################################################
1174 1411
1175package CFClient::UI::Label; 1412package CFClient::UI::Label;
1176 1413
1177our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1178 1415
1179use CFClient::OpenGL; 1416use CFClient::OpenGL;
1180 1417
1181sub new { 1418sub new {
1182 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1183 1420
1184 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1186 #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),
1187 fontsize => 1, 1431 fontsize => 1,
1188 text => "",
1189 align => -1, 1432 align => -1,
1190 valign => -1, 1433 valign => -1,
1191 padding => 2, 1434 padding_x => 2,
1192 layout => new CFClient::Layout, 1435 padding_y => 2,
1193 can_events => 0, 1436 can_events => 0,
1194 %arg 1437 %arg
1195 ); 1438 );
1196 1439
1197 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1443 $self->{template} = $layout;
1201 } 1444 }
1202 1445
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1204 $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 }
1205 1451
1206 $self 1452 $self
1207} 1453}
1208 1454
1209sub escape { 1455sub escape($) {
1210 local $_ = $_[1]; 1456 local $_ = $_[0];
1211 1457
1212 s/&/&amp;/g; 1458 s/&/&amp;/g;
1213 s/>/&gt;/g; 1459 s/>/&gt;/g;
1214 s/</&lt;/g; 1460 s/</&lt;/g;
1215 1461
1216 $_[1] 1462 $_
1217} 1463}
1218 1464
1219sub update { 1465sub update {
1220 my ($self) = @_; 1466 my ($self) = @_;
1221 1467
1222 delete $self->{texture}; 1468 delete $self->{texture};
1223 $self->SUPER::update; 1469 $self->SUPER::update;
1224} 1470}
1225 1471
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1472sub set_text {
1233 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1234 1474
1235 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1237 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1239 1480
1240 delete $self->{texture}; 1481 $self->realloc;
1241 $self->update; 1482 $self->update;
1242 $self->check_size;
1243} 1483}
1244 1484
1245sub set_markup { 1485sub set_markup {
1246 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1247 1487
1248 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1250 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1252 1495
1253 delete $self->{texture}; 1496 $self->realloc;
1254 $self->update; 1497 $self->update;
1255 $self->check_size;
1256} 1498}
1257 1499
1258sub size_request { 1500sub size_request {
1259 my ($self) = @_; 1501 my ($self) = @_;
1260 1502
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1508
1265 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1266 1510
1267 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1272 1516
1273 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1275 } 1519 }
1276 1520
1277 ( 1521 ($w, $h)
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281} 1522}
1282 1523
1283sub size_allocate { 1524sub size_allocate {
1284 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1285 1526
1286 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1287} 1529}
1288 1530
1289sub set_fontsize { 1531sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1291 1533
1292 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1535 delete $self->{texture};
1294 $self->check_size; 1536
1295 $self->update; 1537 $self->realloc;
1296} 1538}
1297 1539
1298sub _draw { 1540sub _draw {
1299 my ($self) = @_; 1541 my ($self) = @_;
1300 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1301 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1305 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
1306 }; 1564 };
1307 1565
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1568
1569 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $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 }
1328 1575
1329 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1577}
1332 1578
1333############################################################################# 1579#############################################################################
1334 1580
1335package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1349 can_hover => 1, 1595 can_hover => 1,
1350 can_focus => 1, 1596 can_focus => 1,
1351 valign => 0, 1597 valign => 0,
1352 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1353 @_ 1600 @_
1354 ) 1601 )
1355} 1602}
1356 1603
1357sub _set_text { 1604sub _set_text {
… …
1367 $self->{text} = $text; 1614 $self->{text} = $text;
1368 1615
1369 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1371 1618
1372 $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;
1373} 1629}
1374 1630
1375sub get_text { 1631sub get_text {
1376 $_[0]{text} 1632 $_[0]{text}
1377} 1633}
… …
1380 my ($self) = @_; 1636 my ($self) = @_;
1381 1637
1382 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1383 1639
1384 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1641}
1400 1642
1401sub key_down { 1643sub key_down {
1402 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1403 1645
… …
1405 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1407 1649
1408 my $text = $self->get_text; 1650 my $text = $self->get_text;
1409 1651
1410 if ($sym == 8) { 1652 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1665 $self->_emit ('escape');
1424 } elsif ($uni) { 1666 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1668 }
1427 1669
1428 $self->_set_text ($text); 1670 $self->_set_text ($text);
1429 $self->update; 1671
1672 $self->realloc;
1430} 1673}
1431 1674
1432sub focus_in { 1675sub focus_in {
1433 my ($self) = @_; 1676 my ($self) = @_;
1434 1677
… …
1514 if ($sym == 13) { 1757 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1520 $self->update; 1763 $self->update;
1521 1764
1522 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1561 1804
1562sub new { 1805sub new {
1563 my $class = shift; 1806 my $class = shift;
1564 1807
1565 $class->SUPER::new ( 1808 $class->SUPER::new (
1566 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1567 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1570 can_hover => 1, 1813 can_hover => 1,
1571 align => 0, 1814 align => 0,
1572 valign => 0, 1815 valign => 0,
1573 can_events => 1, 1816 can_events => 1,
1574 @_ 1817 @_
1575 ) 1818 )
1576} 1819}
1577 1820
1821sub activate { }
1822
1578sub button_up { 1823sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1580 1825
1826 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1829}
1586 1830
1587sub _draw { 1831sub _draw {
1588 my ($self) = @_; 1832 my ($self) = @_;
1589 1833
… …
1591 1835
1592 if ($GRAB == $self) { 1836 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1837 $self->{fg} = $self->{active_fg};
1594 } 1838 }
1595 1839
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1840 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1842 glColor 0, 0, 0, 1;
1601 1843
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1845
1604 glDisable GL_TEXTURE_2D; 1846 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1847
1607 $self->SUPER::_draw; 1848 $self->SUPER::_draw;
1608} 1849}
1609 1850
1610############################################################################# 1851#############################################################################
… …
1621 1862
1622sub new { 1863sub new {
1623 my $class = shift; 1864 my $class = shift;
1624 1865
1625 $class->SUPER::new ( 1866 $class->SUPER::new (
1626 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1627 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1628 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],
1629 state => 0, 1873 state => 0,
1630 can_hover => 1, 1874 can_hover => 1,
1631 @_ 1875 @_
1632 ) 1876 )
1633} 1877}
1634 1878
1635sub size_request { 1879sub size_request {
1636 my ($self) = @_; 1880 my ($self) = @_;
1637 1881
1638 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1639} 1883}
1640 1884
1641sub button_down { 1885sub button_down {
1642 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1643 1887
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1646 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1648 } 1892 }
1649} 1893}
1650 1894
1651sub _draw { 1895sub _draw {
1652 my ($self) = @_; 1896 my ($self) = @_;
1653 1897
1654 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1655 1899
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1657 1901
1658 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;
1659 1905
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1907
1662 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1663 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1913}
1673 1914
1674############################################################################# 1915#############################################################################
1675 1916
1676package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1720 1961
1721 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1722 } 1963 }
1723 1964
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1967
1729 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1969
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1733} 1971}
1734 1972
1735############################################################################# 1973#############################################################################
1736 1974
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1926 2164
1927sub new { 2165sub new {
1928 my $class = shift; 2166 my $class = shift;
1929 2167
1930 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1931 2169
1932 # TODO: 0-width page 2170 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2172 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2179 min_w => $::WIDTH / 80,
1940 req_h => 20, 2180 min_h => $::WIDTH / 80,
1941 vertical => 0, 2181 vertical => 0,
1942 can_hover => 1, 2182 can_hover => 1,
1943 inner_pad => 5, 2183 inner_pad => 0.02,
1944 @_ 2184 @_
1945 ); 2185 );
1946 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1947 $self 2190 $self
1948} 2191}
1949 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
1950sub size_request { 2227sub size_request {
1951 my ($self) = @_; 2228 my ($self) = @_;
1952 2229
1953 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1954 my $h = $self->{req_h};
1955
1956 $self->{vertical} ? ($h, $w) : ($w, $h)
1957} 2231}
1958 2232
1959sub button_down { 2233sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1961 2235
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1964} 2241}
1965 2242
1966sub mouse_motion { 2243sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1968 2245
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
1971 2265
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2267
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2270
1977 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2273
1983 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2275 $self->{knob_w} = $knob_w;
1985 } 2276 });
1986}
1987 2277
1988# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2279}
1995 2280
1996sub _draw { 2281sub _draw {
1997 my ($self) = @_; 2282 my ($self) = @_;
1998 2283
1999 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
2000 2285
2001 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
2002 2287
2003 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
2005 2290
2291 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2293 }
2011 2294
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2297
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2300
2038 # draw background 2301 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2303
2041 # draw handle 2304 # draw handle
2042 $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);
2043 2306
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2046} 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 (@_) }
2047 2350
2048############################################################################# 2351#############################################################################
2049 2352
2050package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2051 2354
… …
2060 fontsize => 1, 2363 fontsize => 1,
2061 can_events => 0, 2364 can_events => 0,
2062 #font => default_font 2365 #font => default_font
2063 @_, 2366 @_,
2064 2367
2065 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
2066 par => [], 2369 par => [],
2067 height => 0, 2370 height => 0,
2068 children => [ 2371 children => [
2069 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
2071 ], 2374 ],
2072 ); 2375 );
2073 2376
2074 $self->{children}[1]->connect (changed => sub { 2377 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2378
2078 $self 2379 $self
2079} 2380}
2080 2381
2081sub set_fontsize { 2382sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2383 my ($self, $fontsize) = @_;
2083 2384
2084 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2386 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2387}
2106 2388
2107sub size_allocate { 2389sub size_allocate {
2108 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2109 2391
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2397
2116 $self->reflow; 2398 $self->reflow;
2117} 2399}
2118 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
2119sub add_paragraph { 2435sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2121 2437
2122 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2123 2439 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2127 2443
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $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]);
2131 $self->{children}[1]->update;
2132} 2445}
2133 2446
2134sub update { 2447sub update {
2135 my ($self) = @_; 2448 my ($self) = @_;
2136 2449
… …
2138 2451
2139 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2140 2453
2141 delete $self->{texture}; 2454 delete $self->{texture};
2142 2455
2143 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2144 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2460 my $height = 0;
2146 2461
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2148 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 }
2149 2477
2150 $self->{height} = $height; 2478 $self->{height} = $height;
2151 2479
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2481
2154 delete $self->{texture}; 2482 delete $self->{texture};
2155 } 2483 }
2156 2484
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2160 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
2161 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2503
2177 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2505 my $h = $par->[1];
2179 2506
2180 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]);
2181 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2182 2511
2183 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2513
2185 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;
2186 } 2516 }
2187 2517
2188 $y += $h; 2518 $y += $h;
2189 } 2519 }
2190 2520
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
2193 }; 2522 };
2194 }); 2523 });
2195} 2524}
2196 2525
2197sub _draw { 2526sub _draw {
2198 my ($self) = @_; 2527 my ($self) = @_;
2199 2528
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2204 $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});
2205 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2206 }
2207 2534
2208 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2209 2536
2210} 2537}
2211 2538
… …
2259 2586
2260sub new { 2587sub new {
2261 my $class = shift; 2588 my $class = shift;
2262 2589
2263 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2264 state => 0, 2591 state => 0,
2265 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2266 @_ 2593 @_
2267 ); 2594 );
2268 2595
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 2596 $self
2275} 2597}
2276 2598
2277sub toggle_flopper { 2599sub toggle_flopper {
2278 my ($self) = @_; 2600 my ($self) = @_;
2279 2601
2280 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 2603}
2292 2604
2293############################################################################# 2605#############################################################################
2294 2606
2295package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2305 @_, 2617 @_,
2306 can_events => 0, 2618 can_events => 0,
2307 ) 2619 )
2308} 2620}
2309 2621
2310sub set_markup { 2622sub set_tooltip_from {
2311 my ($self, $text) = @_; 2623 my ($self, $widget) = @_;
2312 2624
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2625 my $tooltip = $widget->{tooltip};
2314 $self->{label}->set_markup ($text); 2626
2315 $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 );
2316} 2642}
2317 2643
2318sub size_request { 2644sub size_request {
2319 my ($self) = @_; 2645 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2646
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2648
2325 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2326} 2650}
… …
2329 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2330 2654
2331 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332} 2656}
2333 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
2334sub _draw { 2676sub _draw {
2335 my ($self) = @_; 2677 my ($self) = @_;
2336 2678
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2679 glTranslate 0.375, 0.375;
2339 2680
2340 my ($w, $h) = @$self{qw(w h)}; 2681 my ($w, $h) = @$self{qw(w h)};
2341 2682
2342 glColor 1, 0.8, 0.4; 2683 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2694 glVertex 0 , $h;
2354 glVertex $w, $h; 2695 glVertex $w, $h;
2355 glVertex $w, 0; 2696 glVertex $w, 0;
2356 glEnd; 2697 glEnd;
2357 2698
2358 glPopMatrix; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2359 2700
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2362} 2702}
2363 2703
2364############################################################################# 2704#############################################################################
2365 2705
… …
2370use CFClient::OpenGL; 2710use CFClient::OpenGL;
2371 2711
2372sub new { 2712sub new {
2373 my $class = shift; 2713 my $class = shift;
2374 2714
2375 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2376 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2377 @_, 2718 @_,
2378 ) 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
2379} 2736}
2380 2737
2381sub size_request { 2738sub size_request {
2382 (32, 8) 2739 (32, 8)
2383} 2740}
2384 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2385sub draw { 2750sub _draw {
2386 my ($self) = @_; 2751 my ($self) = @_;
2387 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
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2765
2390 if ($tex) { 2766 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2400} 2782}
2401 2783
2402############################################################################# 2784#############################################################################
2403 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
2404package CFClient::UI::Root; 3259package CFClient::UI::Root;
2405 3260
2406our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2407 3262
2408use CFClient::OpenGL; 3263use CFClient::OpenGL;
2409 3264
2410sub check_size { 3265sub new {
2411 my ($self) = @_; 3266 my $class = shift;
2412 3267
2413 $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
2414} 3276}
2415 3277
2416sub size_request { 3278sub size_request {
2417 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
2418}
2419 3280
2420sub 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 {
2421 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2422 3300
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) { 3301 for my $child ($self->children) {
2426 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)};
2427 3303
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3304 $X = $child->{force_x} if exists $child->{force_x};
2429 $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
2430 $child->configure ($X, $Y, $W,$H); 3310 $child->configure ($X, $Y, $W, $H);
2431 } 3311 }
2432} 3312}
2433 3313
2434sub _topleft { 3314sub coord2local {
2435 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2436 3316
2437 ($x, $y) 3317 ($x, $y)
2438} 3318}
2439 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2440sub update { 3326sub update {
2441 my ($self) = @_; 3327 my ($self) = @_;
2442 3328
2443 $self->check_size; 3329 $::WANT_REFRESH++;
2444 ::refresh ();
2445} 3330}
2446 3331
2447sub add { 3332sub add {
2448 my ($self, $child) = @_; 3333 my ($self, @children) = @_;
2449 3334
2450 # integerize window positions 3335 $_->{is_toplevel} = 1
2451 $child->{x} = int $child->{x}; 3336 for @children;
2452 $child->{y} = int $child->{y};
2453 3337
2454 $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 }
2455} 3354}
2456 3355
2457sub on_refresh { 3356sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2459 3358
2460 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2461} 3360}
2462 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2463sub draw { 3368sub draw {
2464 my ($self) = @_; 3369 my ($self) = @_;
2465 3370
2466 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2468 } 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
2469 3449
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2473 3453
2474 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3455 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3458 glLoadIdentity;
2479 3459
2480 $self->_draw; 3460 $self->_draw;
2481} 3461}
… …
2483############################################################################# 3463#############################################################################
2484 3464
2485package CFClient::UI; 3465package CFClient::UI;
2486 3466
2487$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3469
24901 34701
2491 3471

Diff Legend

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