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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 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
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 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
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 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
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 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};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 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
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $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;
238 } 368 }
239} 369}
240 370
241sub size_allocate { 371sub size_allocate {
242 # nothing to be done 372 # nothing to be done
243} 373}
244 374
245sub children { 375sub children {
246} 376}
247 377
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
260sub set_max_size { 378sub set_max_size {
261 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
262 380
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 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 }
265} 399}
266 400
267# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
268sub coord2local { 402sub coord2local {
269 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 418 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
286 420
287 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
288 422
289 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
290 424
291 $focus->update if $focus; 425 $focus->update if $focus;
292 $FOCUS->update; 426 $FOCUS->update;
293} 427}
294 428
… …
297 431
298 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
299 433
300 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
301 435
302 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
303 437
304 $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;
305} 442}
306 443
307sub mouse_motion { } 444sub mouse_motion { }
308sub button_up { } 445sub button_up { }
309sub key_down { } 446sub key_down { }
310sub key_up { } 447sub key_up { }
311 448
312sub button_down { 449sub button_down {
313 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
314 451
315 $self->focus_in; 452 $self->focus_in;
… …
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
322sub 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}
323 530
324sub draw { 531sub draw {
325 my ($self) = @_; 532 my ($self) = @_;
326 533
327 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
344 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
345 glEnd; 552 glEnd;
346 glDisable GL_BLEND; 553 glDisable GL_BLEND;
347 } 554 }
348 555
349 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
350 glPushMatrix; 557 glPushMatrix;
351 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 561 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
358 glEnd; 565 glEnd;
359 glPopMatrix; 566 glPopMatrix;
360 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;
361 } 568 }
362} 569}
363 570
364sub _draw { 571sub _draw {
365 my ($self) = @_; 572 my ($self) = @_;
366 573
367 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
368} 575}
369 576
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent);
387}
388
389sub check_size {
390 my ($self) = @_;
391
392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393}
394
395sub update {
396 my ($self) = @_;
397
398 $self->{parent}->update
399 if $self->{parent};
400}
401
402sub connect {
403 my ($self, $signal, $cb) = @_;
404
405 push @{ $self->{signal_cb}{$signal} }, $cb;
406}
407
408sub emit {
409 my ($self, $signal, @args) = @_;
410
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
412}
413
414sub DESTROY { 577sub DESTROY {
415 my ($self) = @_; 578 my ($self) = @_;
416 579
580 delete $WIDGET{$self+0};
417 #$self->deactivate; 581 #$self->deactivate;
418} 582}
419 583
420############################################################################# 584#############################################################################
421 585
… …
430 my $class = shift; 594 my $class = shift;
431 595
432 # range [value, low, high, page] 596 # range [value, low, high, page]
433 597
434 $class->SUPER::new ( 598 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
437 @_ 601 @_
438 ) 602 )
439} 603}
440 604
441sub _draw { 605sub _draw {
442 my ($self) = @_; 606 my ($self) = @_;
443 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
445 614
446 glEnable GL_BLEND; 615 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
449 618
450 glBegin GL_QUADS; 619 glBegin GL_QUADS;
451 glVertex 0 , 0; 620 glVertex 0 , 0;
452 glVertex 0 , $h; 621 glVertex 0 , $h;
453 glVertex $w, $h; 622 glVertex $w, $h;
454 glVertex $w, 0; 623 glVertex $w, 0;
455 glEnd; 624 glEnd;
456 625
457 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
458} 628}
459 629
460############################################################################# 630#############################################################################
461 631
462package CFClient::UI::Empty; 632package CFClient::UI::Empty;
… …
467 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
468 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
469} 639}
470 640
471sub size_request { 641sub size_request {
472 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
473} 645}
474 646
475sub draw { } 647sub draw { }
476 648
477############################################################################# 649#############################################################################
… …
506 $self->{children} = [ 678 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
509 ]; 681 ];
510 682
511 $_->check_size 683 $self->realloc;
512 for @widgets;
513
514 $self->update;
515} 684}
516 685
517sub children { 686sub children {
518 @{ $_[0]{children} } 687 @{ $_[0]{children} }
519} 688}
… …
524 delete $child->{parent}; 693 delete $child->{parent};
525 $child->hide; 694 $child->hide;
526 695
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 697
529 $self->check_size; 698 $self->realloc;
530 $self->update;
531} 699}
532 700
533sub clear { 701sub clear {
534 my ($self) = @_; 702 my ($self) = @_;
535 703
… …
539 for (@$children) { 707 for (@$children) {
540 delete $_->{parent}; 708 delete $_->{parent};
541 $_->hide; 709 $_->hide;
542 } 710 }
543 711
544 $self->check_size; 712 $self->realloc;
545 $self->update;
546} 713}
547 714
548sub find_widget { 715sub find_widget {
549 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
550 717
… …
625} 792}
626 793
627sub update { 794sub update {
628 my ($self) = @_; 795 my ($self) = @_;
629 796
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 798 $self->SUPER::update;
632} 799}
633 800
634sub size_allocate { 801sub size_allocate {
635 my ($self, $w, $h) = @_; 802 my ($self, $w, $h) = @_;
… …
648 $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 {
649 glClearColor 0, 0, 0, 0; 816 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 817 glClear GL_COLOR_BUFFER_BIT;
651 818
652 $self->_render; 819 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 820 };
661} 821}
662 822
663sub _draw { 823sub _draw {
664 my ($self) = @_; 824 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 826 my ($w, $h) = ($self->w, $self->h);
667 827
668 my $tex = $self->{texture} 828 my $tex = $self->{texture}
669 or return; 829 or return;
670 830
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 833 glColor 1, 1, 1, 1;
676 834
677 $tex->draw_quad (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 836
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
681} 838}
682 839
683############################################################################# 840#############################################################################
684 841
685package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
686 843
687our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
688 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
689sub size_request { 856sub size_request {
690 my ($self) = @_; 857 my ($self) = @_;
691 858
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 860
695 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
696} 865}
697 866
698sub size_allocate { 867sub size_allocate {
699 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 876 $self->update;
702} 877}
703 878
704sub set_offset { 879sub set_offset {
705 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 931 my $class = shift;
757 932
758 my $self; 933 my $self;
759 934
760 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
761 vertical => 1, 936 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 938 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
765 }, 940 },
766 ; 941 ;
767 942
768 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 944 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 945 slider => $slider,
771 @_, 946 @_,
772 ); 947 );
773 948
774 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
777 952
778 $self 953 $self
779} 954}
780 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
781#TODO# update range on size_allocate depeneing on child 975#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 976# update viewport offset on scroll
783 977
784############################################################################# 978#############################################################################
785 979
786package CFClient::UI::Frame; 980package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 984use CFClient::OpenGL;
791 985
792sub new { 986sub new {
793 my $class = shift; 987 my $class = shift;
794 988
795 my $self = $class->SUPER::new ( 989 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 990 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 991 @_,
800 ); 992 )
801
802 $self
803} 993}
804 994
805sub _draw { 995sub _draw {
806 my ($self) = @_; 996 my ($self) = @_;
807 997
808 my ($w, $h) = ($self->{w}, $self->{h}); 998 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)};
809 1000
810 glEnable GL_BLEND; 1001 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 1003 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 1004
815# glBegin GL_QUADS; 1005 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 1006 glVertex 0 , 0;
818# glVertex 0 , $h; 1007 glVertex 0 , $h;
819# glVertex $w, $h; 1008 glVertex $w, $h;
820# glVertex $w, 0; 1009 glVertex $w, 0;
821# glEnd; 1010 glEnd;
822 1011
823
824 $self->child->draw;
825 glDisable GL_BLEND; 1012 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 1013 }
1014
1015 $self->SUPER::_draw;
827} 1016}
828 1017
829############################################################################# 1018#############################################################################
830 1019
831package CFClient::UI::FancyFrame; 1020package CFClient::UI::FancyFrame;
832 1021
833our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
834 1023
835use CFClient::OpenGL; 1024use CFClient::OpenGL;
836 1025
837my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
839 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);
840 1033
841sub new { 1034sub new {
842 my $class = shift; 1035 my $class = shift;
843 1036
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1040 border => 0.6,
850 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
851 @_ 1044 @_
852 ); 1045 );
853 1046
854 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1048 align => 0,
… …
879 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
880 1073
881 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
883 1076
884 $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)
885 if $self->{title}; 1078 if $self->{title};
886 1079
887 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1081}
889 1082
… …
908 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
909 1102
910 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
912 1105
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size;
917 }; 1111 };
918 1112
919 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1117 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
925 1119
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
927 1121
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update;
930 }; 1123 };
931 } 1124 }
932} 1125}
933 1126
934sub button_up { 1127sub button_up {
… …
947 my ($self) = @_; 1140 my ($self) = @_;
948 1141
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1142 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1144
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1145 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1147
957 my $border = $self->border; 1148 my $border = $self->border;
958 1149
959 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1155
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
967 1158
968 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
971
972 glColor @{ $self->{bg} };
973
974 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 }
978 1165
979 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1167
983 $self->{title}->draw if $self->{title}; 1168 $self->{title}->draw if $self->{title};
984 1169
985 $self->child->draw; 1170 $self->child->draw;
986} 1171}
… …
998sub new { 1183sub new {
999 my $class = shift; 1184 my $class = shift;
1000 1185
1001 $class->SUPER::new ( 1186 $class->SUPER::new (
1002 col_expand => [], 1187 col_expand => [],
1003 @_ 1188 @_,
1004 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1194}
1006 1195
1007sub add { 1196sub add {
1008 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1009 1198
1010 $child->set_parent ($self); 1199 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1012 1201
1013 $child->check_size; 1202 $self->realloc;
1014} 1203}
1015 1204
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# 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?
1021sub clear { 1206sub clear {
1022 my ($self) = @_; 1207 my ($self) = @_;
1023 1208
1024 my @children = $self->children; 1209 my @children = $self->children;
1025 delete $self->{children}; 1210 delete $self->{children};
… …
1027 for (@children) { 1212 for (@children) {
1028 delete $_->{parent}; 1213 delete $_->{parent};
1029 $_->hide; 1214 $_->hide;
1030 } 1215 }
1031 1216
1032 $self->update; 1217 $self->realloc;
1033} 1218}
1034 1219
1035sub get_wh { 1220sub get_wh {
1036 my ($self) = @_; 1221 my ($self) = @_;
1037 1222
… …
1068sub size_allocate { 1253sub size_allocate {
1069 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1070 1255
1071 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1072 1257
1073 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1075 1260
1076 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1133 } 1318 }
1134} 1319}
1135 1320
1136############################################################################# 1321#############################################################################
1137 1322
1138package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1139
1140# TODO: wrap into common Box base class
1141 1324
1142our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1143 1326
1144sub size_request { 1327sub size_request {
1145 my ($self) = @_; 1328 my ($self) = @_;
1146 1329
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1148 1331 ? (
1149 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1150 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1151 (List::Util::max map $_->[1], @alloc), 1334 )
1152 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1153} 1339}
1154 1340
1155sub size_allocate { 1341sub size_allocate {
1156 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1157 1343
1158 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1159
1160 my $children = $self->{children}; 1345 my $children = $self->{children};
1161 1346
1162 my @h = map $_->{req_w}, @$children; 1347 my @req;
1163 1348
1164 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1165 1350 @req = ($space / (@$children || 1)) x @$children;
1166 if ($req_h > $h) {
1167 # ah well, not enough space
1168 $_ *= $h / $req_h for @h;
1169 } 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 {
1170 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1171 $exp ||= 1;
1172 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1173 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 } 1365 }
1180 } 1366 }
1181 1367
1182 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1183 1369
1184 my $y = 0; 1370 my $pos = 0;
1185 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1188 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1189 1374
1190 $y += $h; 1375 $pos += $alloc;
1191 } 1376 }
1192 1377
1193 1 1378 1
1194} 1379}
1195 1380
1196############################################################################# 1381#############################################################################
1197 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
1198package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1199 1399
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1203 1401
1204sub size_request { 1402sub new {
1205 my ($self) = @_; 1403 my $class = shift;
1206 1404
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1208 1406 vertical => 1,
1209 ( 1407 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1408 )
1213} 1409}
1214 1410
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
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
1427 #text => initial text
1428 #markup => initial narkup
1429 #max_w => maximum pixel width
1430 ellipsise => 3, # end
1431 layout => (new CFClient::Layout),
1266 fontsize => 1, 1432 fontsize => 1,
1267 text => "",
1268 align => -1, 1433 align => -1,
1269 valign => -1, 1434 valign => -1,
1270 padding => 2, 1435 padding_x => 2,
1271 layout => new CFClient::Layout, 1436 padding_y => 2,
1272 can_events => 0, 1437 can_events => 0,
1273 %arg 1438 %arg
1274 ); 1439 );
1275 1440
1276 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1444 $self->{template} = $layout;
1280 } 1445 }
1281 1446
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1448 $self->set_markup (delete $self->{markup});
1449 } else {
1450 $self->set_text (delete $self->{text});
1451 }
1284 1452
1285 $self 1453 $self
1286} 1454}
1287 1455
1288sub escape { 1456sub escape($) {
1289 local $_ = $_[1]; 1457 local $_ = $_[0];
1290 1458
1291 s/&/&amp;/g; 1459 s/&/&amp;/g;
1292 s/>/&gt;/g; 1460 s/>/&gt;/g;
1293 s/</&lt;/g; 1461 s/</&lt;/g;
1294 1462
1295 $_[1] 1463 $_
1296} 1464}
1297 1465
1298sub update { 1466sub update {
1299 my ($self) = @_; 1467 my ($self) = @_;
1300 1468
… …
1306 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1307 1475
1308 return if $self->{text} eq "T$text"; 1476 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1310 1478
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1312 1481
1482 $self->realloc;
1313 $self->update; 1483 $self->update;
1314 $self->check_size;
1315} 1484}
1316 1485
1317sub set_markup { 1486sub set_markup {
1318 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1319 1488
1320 return if $self->{text} eq "M$markup"; 1489 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1490 $self->{text} = "M$markup";
1322 1491
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1324 1496
1497 $self->realloc;
1325 $self->update; 1498 $self->update;
1326 $self->check_size;
1327} 1499}
1328 1500
1329sub size_request { 1501sub size_request {
1330 my ($self) = @_; 1502 my ($self) = @_;
1331 1503
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $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});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1509
1336 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1337 1511
1338 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1343 1517
1344 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1345 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1346 } 1520 }
1347 1521
1348 ( 1522 ($w, $h)
1349 $w + $self->{padding} * 2,
1350 $h + $self->{padding} * 2,
1351 )
1352} 1523}
1353 1524
1354sub size_allocate { 1525sub size_allocate {
1355 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1356 1527
1357 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1358} 1530}
1359 1531
1360sub set_fontsize { 1532sub set_fontsize {
1361 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1362 1534
1363 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1364 delete $self->{texture}; 1536 delete $self->{texture};
1365 1537
1366 $self->update; 1538 $self->realloc;
1367 $self->check_size;
1368} 1539}
1369 1540
1370sub _draw { 1541sub _draw {
1371 my ($self) = @_; 1542 my ($self) = @_;
1372 1543
1544 $self->SUPER::_draw; # draw background, if applicable
1545
1373 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $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});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553
1377 new_from_layout CFClient::Texture $self->{layout} 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1555
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5);
1559
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5);
1563
1564 $tex
1378 }; 1565 };
1379 1566
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1569
1570 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1571 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1573 } else {
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1575 }
1400 1576
1401 glDisable GL_TEXTURE_2D; 1577 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1578}
1404 1579
1405############################################################################# 1580#############################################################################
1406 1581
1407package CFClient::UI::EntryBase; 1582package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1421 can_hover => 1, 1596 can_hover => 1,
1422 can_focus => 1, 1597 can_focus => 1,
1423 valign => 0, 1598 valign => 0,
1424 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1425 @_ 1601 @_
1426 ) 1602 )
1427} 1603}
1428 1604
1429sub _set_text { 1605sub _set_text {
… …
1439 $self->{text} = $text; 1615 $self->{text} = $text;
1440 1616
1441 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1443 1619
1444 $self->emit (changed => $self->{text}); 1620 $self->_emit (changed => $self->{text});
1621}
1622
1623sub set_text {
1624 my ($self, $text) = @_;
1625
1626 $self->{cursor} = length $text;
1627 $self->_set_text ($text);
1628
1629 $self->realloc;
1445} 1630}
1446 1631
1447sub get_text { 1632sub get_text {
1448 $_[0]{text} 1633 $_[0]{text}
1449} 1634}
… …
1452 my ($self) = @_; 1637 my ($self) = @_;
1453 1638
1454 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1455 1640
1456 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text {
1466 my ($self, $text) = @_;
1467
1468 $self->{cursor} = length $text;
1469 $self->_set_text ($text);
1470 $self->update;
1471} 1642}
1472 1643
1473sub key_down { 1644sub key_down {
1474 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1475 1646
… …
1477 my $sym = $ev->{sym}; 1648 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1649 my $uni = $ev->{unicode};
1479 1650
1480 my $text = $self->get_text; 1651 my $text = $self->get_text;
1481 1652
1482 if ($sym == 8) { 1653 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1655 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1656 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1657 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1658 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1659 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1660 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1665 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1666 $self->_emit ('escape');
1496 } elsif ($uni) { 1667 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1669 }
1499 1670
1500 $self->_set_text ($text); 1671 $self->_set_text ($text);
1501 $self->update; 1672
1673 $self->realloc;
1502} 1674}
1503 1675
1504sub focus_in { 1676sub focus_in {
1505 my ($self) = @_; 1677 my ($self) = @_;
1506 1678
… …
1586 if ($sym == 13) { 1758 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1592 $self->update; 1764 $self->update;
1593 1765
1594 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1633 1805
1634sub new { 1806sub new {
1635 my $class = shift; 1807 my $class = shift;
1636 1808
1637 $class->SUPER::new ( 1809 $class->SUPER::new (
1638 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1639 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1642 can_hover => 1, 1814 can_hover => 1,
1643 align => 0, 1815 align => 0,
1644 valign => 0, 1816 valign => 0,
1645 can_events => 1, 1817 can_events => 1,
1646 @_ 1818 @_
1647 ) 1819 )
1648} 1820}
1649 1821
1822sub activate { }
1823
1650sub button_up { 1824sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1652 1826
1827 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1830}
1658 1831
1659sub _draw { 1832sub _draw {
1660 my ($self) = @_; 1833 my ($self) = @_;
1661 1834
… …
1663 1836
1664 if ($GRAB == $self) { 1837 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1838 $self->{fg} = $self->{active_fg};
1666 } 1839 }
1667 1840
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1841 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1843 glColor 0, 0, 0, 1;
1673 1844
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1846
1676 glDisable GL_TEXTURE_2D; 1847 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1848
1679 $self->SUPER::_draw; 1849 $self->SUPER::_draw;
1680} 1850}
1681 1851
1682############################################################################# 1852#############################################################################
… …
1693 1863
1694sub new { 1864sub new {
1695 my $class = shift; 1865 my $class = shift;
1696 1866
1697 $class->SUPER::new ( 1867 $class->SUPER::new (
1698 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1699 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1874 state => 0,
1702 can_hover => 1, 1875 can_hover => 1,
1703 @_ 1876 @_
1704 ) 1877 )
1705} 1878}
1706 1879
1707sub size_request { 1880sub size_request {
1708 my ($self) = @_; 1881 my ($self) = @_;
1709 1882
1710 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1711} 1884}
1712 1885
1713sub button_down { 1886sub button_down {
1714 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1715 1888
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1720 } 1893 }
1721} 1894}
1722 1895
1723sub _draw { 1896sub _draw {
1724 my ($self) = @_; 1897 my ($self) = @_;
1725 1898
1726 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1727 1900
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 1902
1730 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;
1731 1906
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1908
1734 glEnable GL_BLEND; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1910
1735 glEnable GL_TEXTURE_2D; 1911 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1912 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1913 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1914}
1745 1915
1746############################################################################# 1916#############################################################################
1747 1917
1748package CFClient::UI::Image; 1918package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1961 glTranslate 0, -$self->{w}, 0;
1792 1962
1793 ($w, $h) = ($h, $w); 1963 ($w, $h) = ($h, $w);
1794 } 1964 }
1795 1965
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1966 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1968
1801 $tex->draw_quad (0, 0, $w, $h); 1969 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1970
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1805} 1972}
1806 1973
1807############################################################################# 1974#############################################################################
1808 1975
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
1998 2165
1999sub new { 2166sub new {
2000 my $class = shift; 2167 my $class = shift;
2001 2168
2002 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
2003 2170
2004 # TODO: 0-width page 2171 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2173 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2009 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],
2010 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2013 vertical => 0, 2182 vertical => 0,
2014 can_hover => 1, 2183 can_hover => 1,
2015 inner_pad => 5, 2184 inner_pad => 0.02,
2016 @_ 2185 @_
2017 ); 2186 );
2018 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
2019 $self 2191 $self
2020} 2192}
2021 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
2022sub size_request { 2228sub size_request {
2023 my ($self) = @_; 2229 my ($self) = @_;
2024 2230
2025 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2232}
2030 2233
2031sub button_down { 2234sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2033 2236
2034 $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
2035 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2036} 2242}
2037 2243
2038sub mouse_motion { 2244sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2040 2246
2041 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
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2043 2266
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2268
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2271
2049 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2274
2055 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2276 $self->{knob_w} = $knob_w;
2057 } 2277 });
2058}
2059 2278
2060# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2280}
2067 2281
2068sub _draw { 2282sub _draw {
2069 my ($self) = @_; 2283 my ($self) = @_;
2070 2284
2071 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2072 2286
2073 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2074 2288
2075 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2077 2291
2292 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2294 }
2083 2295
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2298
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2301
2110 # draw background 2302 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2304
2113 # draw handle 2305 # draw handle
2114 $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);
2115 2307
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2118} 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 (@_) }
2119 2351
2120############################################################################# 2352#############################################################################
2121 2353
2122package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2123 2355
… …
2132 fontsize => 1, 2364 fontsize => 1,
2133 can_events => 0, 2365 can_events => 0,
2134 #font => default_font 2366 #font => default_font
2135 @_, 2367 @_,
2136 2368
2137 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
2138 par => [], 2370 par => [],
2139 height => 0, 2371 height => 0,
2140 children => [ 2372 children => [
2141 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
… …
2153 2385
2154 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2387 $self->reflow;
2156} 2388}
2157 2389
2158sub text_height {
2159 my ($self, $text) = @_;
2160
2161 my $layout = $self->{layout};
2162
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text);
2166
2167 ($layout->size)[1]
2168}
2169
2170sub reflow {
2171 my ($self) = @_;
2172
2173 $self->{need_reflow}++;
2174 $self->update;
2175}
2176
2177sub size_allocate { 2390sub size_allocate {
2178 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2179 2392
2180 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2181 2394
… …
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2398
2186 $self->reflow; 2399 $self->reflow;
2187} 2400}
2188 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
2189sub add_paragraph { 2436sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2191 2438
2192 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2193 2440 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2197 2444
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $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]);
2201 $self->{children}[1]->update;
2202} 2446}
2203 2447
2204sub update { 2448sub update {
2205 my ($self) = @_; 2449 my ($self) = @_;
2206 2450
… …
2208 2452
2209 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2210 2454
2211 delete $self->{texture}; 2455 delete $self->{texture};
2212 2456
2213 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2214 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2461 my $height = 0;
2216 2462
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2218 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 }
2219 2478
2220 $self->{height} = $height; 2479 $self->{height} = $height;
2221 2480
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2482
2224 delete $self->{texture}; 2483 delete $self->{texture};
2225 } 2484 }
2226 2485
2227 $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 {
2228 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2230 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
2231 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246 2504
2247 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2506 my $h = $par->[1];
2249 2507
2250 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]);
2251 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2252 2512
2253 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2514
2255 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;
2256 } 2517 }
2257 2518
2258 $y += $h; 2519 $y += $h;
2259 } 2520 }
2260 2521
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2263 }; 2523 };
2264 }); 2524 });
2265} 2525}
2266 2526
2267sub _draw { 2527sub _draw {
2268 my ($self) = @_; 2528 my ($self) = @_;
2269 2529
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2275 $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});
2276 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2535
2279 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2280 2537
2281} 2538}
2282 2539
… …
2330 2587
2331sub new { 2588sub new {
2332 my $class = shift; 2589 my $class = shift;
2333 2590
2334 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2335 state => 0, 2592 state => 0,
2336 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2337 @_ 2594 @_
2338 ); 2595 );
2339 2596
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2597 $self
2346} 2598}
2347 2599
2348sub toggle_flopper { 2600sub toggle_flopper {
2349 my ($self) = @_; 2601 my ($self) = @_;
2350 2602
2351 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2352 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open");
2356 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close");
2359 }
2360
2361 $self->emit (changed => $self->{state});
2362} 2604}
2363 2605
2364############################################################################# 2606#############################################################################
2365 2607
2366package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2376 @_, 2618 @_,
2377 can_events => 0, 2619 can_events => 0,
2378 ) 2620 )
2379} 2621}
2380 2622
2381sub set_markup { 2623sub set_tooltip_from {
2382 my ($self, $text) = @_; 2624 my ($self, $widget) = @_;
2383 2625
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2626 my $tooltip = $widget->{tooltip};
2385 $self->{label}->set_markup ($text); 2627
2386 $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 );
2387} 2643}
2388 2644
2389sub size_request { 2645sub size_request {
2390 my ($self) = @_; 2646 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2647
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2649
2396 ($w + 4, $h + 4) 2650 ($w + 4, $h + 4)
2397} 2651}
… …
2400 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2401 2655
2402 $self->SUPER::size_allocate ($w - 4, $h - 4); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2403} 2657}
2404 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
2405sub _draw { 2677sub _draw {
2406 my ($self) = @_; 2678 my ($self) = @_;
2407 2679
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2680 glTranslate 0.375, 0.375;
2410 2681
2411 my ($w, $h) = @$self{qw(w h)}; 2682 my ($w, $h) = @$self{qw(w h)};
2412 2683
2413 glColor 1, 0.8, 0.4; 2684 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2695 glVertex 0 , $h;
2425 glVertex $w, $h; 2696 glVertex $w, $h;
2426 glVertex $w, 0; 2697 glVertex $w, 0;
2427 glEnd; 2698 glEnd;
2428 2699
2429 glPopMatrix; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2430 2701
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2433} 2703}
2434 2704
2435############################################################################# 2705#############################################################################
2436 2706
… …
2441use CFClient::OpenGL; 2711use CFClient::OpenGL;
2442 2712
2443sub new { 2713sub new {
2444 my $class = shift; 2714 my $class = shift;
2445 2715
2446 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2447 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2448 @_, 2719 @_,
2449 ) 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
2450} 2737}
2451 2738
2452sub size_request { 2739sub size_request {
2453 (32, 8) 2740 (32, 8)
2454} 2741}
2455 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2456sub _draw { 2751sub _draw {
2457 my ($self) = @_; 2752 my ($self) = @_;
2458 2753
2459 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
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2766
2462 # TODO animation
2463 if ($tex) { 2767 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2773 }
2473} 2774}
2474 2775
2475############################################################################# 2776sub DESTROY {
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_; 2777 my ($self) = @_;
2556 2778
2557 $self->{scrolled}->clear; 2779 $self->{timer}->cancel
2558 return unless $items; 2780 if $self->{timer};
2559 2781
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2782 $self->SUPER::DESTROY;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578} 2783}
2579 2784
2580############################################################################# 2785#############################################################################
2581 2786
2582package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2617 2822
2618# 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)
2619sub popup { 2824sub popup {
2620 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2621 2826
2622 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2623 2828
2624 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 2830 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2627 2832
2628 $self->show; 2833 $self->show;
2629 $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);
2630} 2835}
2631 2836
2632sub mouse_motion { 2837sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2634 2839
… …
2642 2847
2643 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 2849 undef $GRAB;
2645 $self->hide; 2850 $self->hide;
2646 2851
2647 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2649 } 2854 }
2650} 2855}
2651 2856
2652############################################################################# 2857#############################################################################
2653 2858
2654package CFClient::UI::Root; 2859package CFClient::UI::Statusbox;
2655 2860
2656our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::VBox::;
2657
2658use CFClient::OpenGL;
2659 2862
2660sub new { 2863sub new {
2661 my $class = shift; 2864 my $class = shift;
2662 2865
2663 $class->SUPER::new ( 2866 $class->SUPER::new (
2867 fontsize => 0.8,
2664 @_, 2868 @_,
2665 ) 2869 )
2666} 2870}
2667 2871
2872sub reorder {
2873 my ($self) = @_;
2874 my $NOW = time;
2875
2876 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 }
2879
2880 my @widgets;
2881
2882 my @items = sort {
2883 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} };
2886
2887 my $count = 10 + 1;
2888 for my $item (@items) {
2889 last unless --$count;
2890
2891 push @widgets, $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text};
2896
2897 for ($short) {
2898 s/^\s+//;
2899 s/\s+/ /g;
2900 }
2901
2902 new CFClient::UI::Label
2903 markup => $short,
2904 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg},
2910 can_events => 1,
2911 can_hover => 1
2912 };
2913 }
2914
2915 $self->clear;
2916 $self->SUPER::add (reverse @widgets);
2917}
2918
2919sub add {
2920 my ($self, $text, %arg) = @_;
2921
2922 $text =~ s/^\s+//;
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},
2944 text => $text,
2945 timeout => $timeout,
2946 tooltip => $text,
2947 fg => [0.8, 0.8, 0.8, 0.8],
2948 pri => 0,
2949 count => 1,
2950 %arg,
2951 };
2952 }
2953
2954 $self->reorder;
2955}
2956
2668sub configure { 2957sub reconfigure {
2958 my ($self) = @_;
2959
2960 delete $_->{label}
2961 for values %{ $self->{item} || {} };
2962
2963 $self->reorder;
2964 $self->SUPER::reconfigure;
2965}
2966
2967#############################################################################
2968
2969package CFClient::UI::Inventory;
2970
2971our @ISA = CFClient::UI::ScrolledWindow::;
2972
2973sub new {
2974 my $class = shift;
2975
2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_,
2979 );
2980
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 {
2669 my ($self, $x, $y, $w, $h) = @_; 3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2670 3130
2671 $self->{w} = $w; 3131 $self->clear_command_list;
2672 $self->{h} = $h; 3132 $self->{recording} = 0;
2673} 3133 $self->{rec_btn}->set_text ("start recording");
2674 3134
2675sub 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 {
2676 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}
2677 3153
2678 $self->size_allocate ($self->{w}, $self->{h}) 3154sub update_binding_widgets {
2679 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
2680} 3277}
2681 3278
2682sub size_request { 3279sub size_request {
2683 my ($self) = @_; 3280 my ($self) = @_;
2684 3281
2685 ($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
2686} 3297}
2687 3298
2688sub size_allocate { 3299sub size_allocate {
2689 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2690 3301
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2707 for my $child ($self->children) { 3302 for my $child ($self->children) {
2708 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)};
2709 3304
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3305 $X = $child->{force_x} if exists $child->{force_x};
2711 $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
2712 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
2713 } 3312 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 3313}
2718 3314
2719sub coord2local { 3315sub coord2local {
2720 my ($self, $x, $y) = @_; 3316 my ($self, $x, $y) = @_;
2721 3317
… …
2729} 3325}
2730 3326
2731sub update { 3327sub update {
2732 my ($self) = @_; 3328 my ($self) = @_;
2733 3329
2734 $self->check_size;
2735 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
2736} 3331}
2737 3332
2738sub add { 3333sub add {
2739 my ($self, $child) = @_; 3334 my ($self, @children) = @_;
2740 3335
2741 # integerise window positions 3336 $_->{is_toplevel} = 1
2742 $child->{x} = int $child->{x}; 3337 for @children;
2743 $child->{y} = int $child->{y};
2744 3338
2745 $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 }
2746} 3355}
2747 3356
2748sub on_refresh { 3357sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2750 3359
2751 $self->{refresh_hook}{$id} = $cb; 3360 $self->{refresh_hook}{$id} = $cb;
2752} 3361}
2753 3362
3363sub on_post_alloc {
3364 my ($self, $id, $cb) = @_;
3365
3366 $self->{post_alloc_hook}{$id} = $cb;
3367}
3368
2754sub draw { 3369sub draw {
2755 my ($self) = @_; 3370 my ($self) = @_;
2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795 3371
2796 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2797 $_->() 3373 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
2799 } 3375 }
2800 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
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2804 3469
2805 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3471 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3474 glLoadIdentity;
2810 3475
2811 $self->_draw; 3476 $self->_draw;
2812} 3477}
… …
2814############################################################################# 3479#############################################################################
2815 3480
2816package CFClient::UI; 3481package CFClient::UI;
2817 3482
2818$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3485
28211 34861
2822 3487

Diff Legend

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