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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

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

Diff Legend

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