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.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 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}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
50 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
51} 69}
52 70
53# class methods for events 71# class methods for events
54sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 74 if $FOCUS;
57} 75}
58 76
59sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 79 if $FOCUS;
62} 80}
63 81
64sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
… …
74 check_tooltip; 92 check_tooltip;
75 } 93 }
76 94
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 96
79 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 99}
84 100
85sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
86 my ($ev) = @_; 102 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
88 104
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 106
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 108
93 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 111
98 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 114 $grab->update if $grab;
101 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 132
119 check_tooltip; 133 check_tooltip;
120 } 134 }
121 135
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 137 if $HOVER;
126} 138}
127 139
128# convert position array to integers 140# convert position array to integers
129sub harmonize { 141sub harmonize {
130 my ($vals) = @_; 142 my ($vals) = @_;
… …
144 156
145 $_->update 157 $_->update
146 for @widgets; 158 for @widgets;
147} 159}
148 160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
149# call when resolution changes etc. 169# call when resolution changes etc.
150sub rescale_widgets { 170sub rescale_widgets {
151 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
152 172
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 173 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
166 } 188 }
167
168 $widget->reconfigure;
169 } 189 }
190
191 reconfigure_widgets;
170} 192}
171 193
172############################################################################# 194#############################################################################
173 195
174package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
179 201
180sub new { 202sub new {
181 my $class = shift; 203 my $class = shift;
182 204
183 my $self = bless { 205 my $self = bless {
184 x => 0, 206 x => "center",
185 y => 0, 207 y => "center",
186 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
187 can_events => 1, 211 can_events => 1,
188 @_ 212 @_
189 }, $class; 213 }, $class;
190 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
191 for (keys %$self) { 217 for (keys %$self) {
192 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
194 } 220 }
195 } 221 }
196 222
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
198 234
199 $self 235 $self
200} 236}
201 237
202sub destroy { 238sub destroy {
… …
207} 243}
208 244
209sub show { 245sub show {
210 my ($self) = @_; 246 my ($self) = @_;
211 247
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
218 return if $self->{parent}; 248 return if $self->{parent};
219 249
220 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
221} 251}
222 252
223sub hide { 253sub set_visible {
224 my ($self) = @_; 254 my ($self) = @_;
225 255
226 for (my @w = $self; @w; ) { 256 return if $self->{visible};
227 my $w = pop @w; 257
228 push @w, $w->children; 258 $self->{root} = $self->{parent}{root};
229 $w->{visible} = 1; 259 $self->{visible} = $self->{parent}{visible} + 1;
230 } 260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
231 277
232 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
234 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
235 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
236 if $self->{parent}; 312 if $self->{parent};
237} 313}
238 314
239sub move { 315sub move_abs {
240 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
241 317
242 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
245 321
246 $self->update; 322 $self->update;
247} 323}
248 324
249sub set_size { 325sub set_size {
250 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
251 327
252 $self->{user_w} = $w; 328 $self->{force_w} = $w;
253 $self->{user_h} = $h; 329 $self->{force_h} = $h;
254 330
255 $self->check_size; 331 $self->realloc;
256} 332}
257 333
258sub size_request { 334sub size_request {
259 require Carp; 335 require Carp;
260 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
262 338
263sub configure { 339sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
265 341
266 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
269 347
270 # use alignment to adjust x, y 348 # use alignment to adjust x, y
271 349
272 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 352 }
277 353
278 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 355 $self->{x} = $x;
280 $self->{y} = $y; 356 $self->{y} = $y;
281 $self->update; 357 $self->update;
282 } 358 }
283 359
284 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
286 } 367 }
287} 368}
288 369
289sub size_allocate { 370sub size_allocate {
290 # nothing to be done 371 # nothing to be done
291} 372}
292 373
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 374sub children {
301} 375}
302 376
303sub set_max_size { 377sub set_max_size {
304 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 382}
309 383
310sub set_tooltip { 384sub set_tooltip {
311 my ($self, $tooltip) = @_; 385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
312 391
313 $self->{tooltip} = $tooltip; 392 $self->{tooltip} = $tooltip;
314 393
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 395 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 417 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
340 419
341 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
342 421
343 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
344 423
345 $focus->update if $focus; 424 $focus->update if $focus;
346 $FOCUS->update; 425 $FOCUS->update;
347} 426}
348 427
… …
351 430
352 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
353 432
354 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
355 434
356 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
357 436
358 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
359} 441}
360 442
361sub mouse_motion { } 443sub mouse_motion { }
362sub button_up { } 444sub button_up { }
363sub key_down { } 445sub key_down { }
364sub key_up { } 446sub key_up { }
365 447
366sub button_down { 448sub button_down {
367 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
368 450
369 $self->focus_in; 451 $self->focus_in;
… …
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
377 529
378sub draw { 530sub draw {
379 my ($self) = @_; 531 my ($self) = @_;
380 532
381 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
398 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
399 glEnd; 551 glEnd;
400 glDisable GL_BLEND; 552 glDisable GL_BLEND;
401 } 553 }
402 554
403 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 556 glPushMatrix;
405 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 560 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
412 glEnd; 564 glEnd;
413 glPopMatrix; 565 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 567 }
416} 568}
417 569
418sub _draw { 570sub _draw {
419 my ($self) = @_; 571 my ($self) = @_;
420 572
421 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 574}
473 575
474sub DESTROY { 576sub DESTROY {
475 my ($self) = @_; 577 my ($self) = @_;
476 578
… …
534 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
536} 638}
537 639
538sub size_request { 640sub size_request {
539 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
540} 644}
541 645
542sub draw { } 646sub draw { }
543 647
544############################################################################# 648#############################################################################
… …
573 $self->{children} = [ 677 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
576 ]; 680 ];
577 681
578 $self->check_size (1); 682 $self->realloc;
579 $self->update;
580} 683}
581 684
582sub children { 685sub children {
583 @{ $_[0]{children} } 686 @{ $_[0]{children} }
584} 687}
… …
589 delete $child->{parent}; 692 delete $child->{parent};
590 $child->hide; 693 $child->hide;
591 694
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 696
594 $self->check_size; 697 $self->realloc;
595 $self->update;
596} 698}
597 699
598sub clear { 700sub clear {
599 my ($self) = @_; 701 my ($self) = @_;
600 702
… …
604 for (@$children) { 706 for (@$children) {
605 delete $_->{parent}; 707 delete $_->{parent};
606 $_->hide; 708 $_->hide;
607 } 709 }
608 710
609 $self->check_size; 711 $self->realloc;
610 $self->update;
611} 712}
612 713
613sub find_widget { 714sub find_widget {
614 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
615 716
… …
739 840
740package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
741 842
742our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
743 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
744sub size_request { 855sub size_request {
745 my ($self) = @_; 856 my ($self) = @_;
746 857
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 859
750 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
751} 864}
752 865
753sub size_allocate { 866sub size_allocate {
754 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
755 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
756 $self->update; 875 $self->update;
757} 876}
758 877
759sub set_offset { 878sub set_offset {
760 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
811 my $class = shift; 930 my $class = shift;
812 931
813 my $self; 932 my $self;
814 933
815 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
816 vertical => 1, 935 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 937 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
820 }, 939 },
821 ; 940 ;
822 941
823 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 943 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
832 951
833 $self 952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 972}
835 973
836#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 975# update viewport offset on scroll
838 976
… …
882 1020
883our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
884 1022
885use CFClient::OpenGL; 1023use CFClient::OpenGL;
886 1024
887my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1032
891sub new { 1033sub new {
892 my $class = shift; 1034 my $class = shift;
893 1035
894 # TODO: user_x, user_y, overwrite moveto?
895
896 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1039 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
902 @_ 1043 @_
903 ); 1044 );
904 1045
905 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 1047 align => 0,
… …
959 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
960 1101
961 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
963 1104
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size;
968 }; 1110 };
969 1111
970 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1116 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
976 1118
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
978 1120
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update;
981 }; 1122 };
982 } 1123 }
983} 1124}
984 1125
985sub button_up { 1126sub button_up {
… …
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1146
1006 my $border = $self->border; 1147 my $border = $self->border;
1007 1148
1008 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1154
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1016 1157
1017 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1163 }
1028 1164
1029 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1030 1166
… …
1046sub new { 1182sub new {
1047 my $class = shift; 1183 my $class = shift;
1048 1184
1049 $class->SUPER::new ( 1185 $class->SUPER::new (
1050 col_expand => [], 1186 col_expand => [],
1051 @_ 1187 @_,
1052 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1193}
1054 1194
1055sub add { 1195sub add {
1056 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1057 1197
1058 $child->set_parent ($self); 1198 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1060 1200
1061 $child->check_size; 1201 $self->realloc;
1062} 1202}
1063 1203
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1205sub clear {
1070 my ($self) = @_; 1206 my ($self) = @_;
1071 1207
1072 my @children = $self->children; 1208 my @children = $self->children;
1073 delete $self->{children}; 1209 delete $self->{children};
… …
1075 for (@children) { 1211 for (@children) {
1076 delete $_->{parent}; 1212 delete $_->{parent};
1077 $_->hide; 1213 $_->hide;
1078 } 1214 }
1079 1215
1080 $self->update; 1216 $self->realloc;
1081} 1217}
1082 1218
1083sub get_wh { 1219sub get_wh {
1084 my ($self) = @_; 1220 my ($self) = @_;
1085 1221
… …
1116sub size_allocate { 1252sub size_allocate {
1117 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1118 1254
1119 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1120 1256
1121 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1123 1259
1124 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1317 }
1182} 1318}
1183 1319
1184############################################################################# 1320#############################################################################
1185 1321
1186package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1323
1190our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1191 1325
1192sub size_request { 1326sub size_request {
1193 my ($self) = @_; 1327 my ($self) = @_;
1194 1328
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1196 1330 ? (
1197 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1333 )
1200 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1201} 1338}
1202 1339
1203sub size_allocate { 1340sub size_allocate {
1204 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1205 1342
1206 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1344 my $children = $self->{children};
1209 1345
1210 my @h = map $_->{req_w}, @$children; 1346 my @req;
1211 1347
1212 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1213 1349 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1364 }
1228 } 1365 }
1229 1366
1230 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1231 1368
1232 my $y = 0; 1369 my $pos = 0;
1233 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1373
1238 $y += $h; 1374 $pos += $alloc;
1239 } 1375 }
1240 1376
1241 1 1377 1
1242} 1378}
1243 1379
1244############################################################################# 1380#############################################################################
1245 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1246package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1247 1398
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1251 1400
1252sub size_request { 1401sub new {
1253 my ($self) = @_; 1402 my $class = shift;
1254 1403
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1256 1405 vertical => 1,
1257 ( 1406 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1407 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1408}
1301 1409
1302############################################################################# 1410#############################################################################
1303 1411
1304package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1429 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1323 fontsize => 1, 1431 fontsize => 1,
1324 align => -1, 1432 align => -1,
1325 valign => -1, 1433 valign => -1,
1326 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1327 can_events => 0, 1436 can_events => 0,
1328 %arg 1437 %arg
1329 ); 1438 );
1330 1439
1331 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1368 1477
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1371 1480
1481 $self->realloc;
1372 $self->update; 1482 $self->update;
1373 $self->check_size;
1374} 1483}
1375 1484
1376sub set_markup { 1485sub set_markup {
1377 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1378 1487
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1492
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1386 1495
1496 $self->realloc;
1387 $self->update; 1497 $self->update;
1388 $self->check_size;
1389} 1498}
1390 1499
1391sub size_request { 1500sub size_request {
1392 my ($self) = @_; 1501 my ($self) = @_;
1393 1502
… …
1407 1516
1408 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1410 } 1519 }
1411 1520
1412 ( 1521 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1522}
1417 1523
1418sub size_allocate { 1524sub size_allocate {
1419 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1420 1526
1421 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1422} 1529}
1423 1530
1424sub set_fontsize { 1531sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1426 1533
1427 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1535 delete $self->{texture};
1429 1536
1430 $self->update; 1537 $self->realloc;
1431 $self->check_size;
1432} 1538}
1433 1539
1434sub _draw { 1540sub _draw {
1435 my ($self) = @_; 1541 my ($self) = @_;
1436 1542
… …
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1552
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448 1554
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1452 1558
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1456 1562
1457 $tex 1563 $tex
1458 }; 1564 };
1459 1565
… …
1488 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1489 can_hover => 1, 1595 can_hover => 1,
1490 can_focus => 1, 1596 can_focus => 1,
1491 valign => 0, 1597 valign => 0,
1492 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1493 @_ 1600 @_
1494 ) 1601 )
1495} 1602}
1496 1603
1497sub _set_text { 1604sub _set_text {
… …
1507 $self->{text} = $text; 1614 $self->{text} = $text;
1508 1615
1509 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1511 1618
1512 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1513} 1620}
1514 1621
1515sub set_text { 1622sub set_text {
1516 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1517 1624
1518 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1626 $self->_set_text ($text);
1520 $self->update; 1627
1521 $self->check_size; 1628 $self->realloc;
1522} 1629}
1523 1630
1524sub get_text { 1631sub get_text {
1525 $_[0]{text} 1632 $_[0]{text}
1526} 1633}
… …
1529 my ($self) = @_; 1636 my ($self) = @_;
1530 1637
1531 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1532 1639
1533 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1641}
1541 1642
1542sub key_down { 1643sub key_down {
1543 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1544 1645
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1664 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1665 $self->_emit ('escape');
1565 } elsif ($uni) { 1666 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1668 }
1568 1669
1569 $self->_set_text ($text); 1670 $self->_set_text ($text);
1570 $self->update; 1671
1571 $self->check_size; 1672 $self->realloc;
1572} 1673}
1573 1674
1574sub focus_in { 1675sub focus_in {
1575 my ($self) = @_; 1676 my ($self) = @_;
1576 1677
… …
1656 if ($sym == 13) { 1757 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1662 $self->update; 1763 $self->update;
1663 1764
1664 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1703 1804
1704sub new { 1805sub new {
1705 my $class = shift; 1806 my $class = shift;
1706 1807
1707 $class->SUPER::new ( 1808 $class->SUPER::new (
1708 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1709 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1711 can_hover => 1, 1813 can_hover => 1,
1712 align => 0, 1814 align => 0,
1713 valign => 0, 1815 valign => 0,
1714 can_events => 1, 1816 can_events => 1,
1715 @_ 1817 @_
1716 ) 1818 )
1717} 1819}
1718 1820
1821sub activate { }
1822
1719sub button_up { 1823sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1721 1825
1826 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1829}
1727 1830
1728sub _draw { 1831sub _draw {
1729 my ($self) = @_; 1832 my ($self) = @_;
1730 1833
… …
1759 1862
1760sub new { 1863sub new {
1761 my $class = shift; 1864 my $class = shift;
1762 1865
1763 $class->SUPER::new ( 1866 $class->SUPER::new (
1764 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1765 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1873 state => 0,
… …
1773} 1877}
1774 1878
1775sub size_request { 1879sub size_request {
1776 my ($self) = @_; 1880 my ($self) = @_;
1777 1881
1778 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1779} 1883}
1780 1884
1781sub button_down { 1885sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1783 1887
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1788 } 1892 }
1789} 1893}
1790 1894
1791sub _draw { 1895sub _draw {
1792 my ($self) = @_; 1896 my ($self) = @_;
1793 1897
1794 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1795 1899
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1901
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1905
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1907
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1909
… …
2067 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2075 vertical => 0, 2181 vertical => 0,
2076 can_hover => 1, 2182 can_hover => 1,
2077 inner_pad => 0.02, 2183 inner_pad => 0.02,
2078 @_ 2184 @_
2079 ); 2185 );
… …
2082 $self->update; 2188 $self->update;
2083 2189
2084 $self 2190 $self
2085} 2191}
2086 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2087sub set_value { 2204sub set_value {
2088 my ($self, $value) = @_; 2205 my ($self, $value) = @_;
2089 2206
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2208
2092 $hi = $lo + 1 if $hi <= $lo; 2209 $hi = $lo + 1 if $hi <= $lo;
2093 2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2094 $value = $lo if $value < $lo; 2213 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2214 $value = $hi - $page if $value > $hi - $page;
2096 2215
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2217 if $unit;
2099 2218
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2220
2104 if ($value != $old_value) { 2221 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2222 $self->_emit (changed => $value);
2106 $self->update; 2223 $self->update;
2107 } 2224 }
2108} 2225}
2109 2226
2110sub size_request { 2227sub size_request {
2111 my ($self) = @_; 2228 my ($self) = @_;
2112 2229
2113 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2231}
2118 2232
2119sub button_down { 2233sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2121 2235
2122 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
2123 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
2124} 2241}
2125 2242
2126sub mouse_motion { 2243sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2248
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2250
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2252
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2254 }
2138} 2255}
2139 2256
2140sub update { 2257sub update {
2141 my ($self) = @_; 2258 my ($self) = @_;
2142 2259
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2261 $self->set_value ($self->{range}[0]);
2145 2262
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
2147 2265
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2267
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2270
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2271 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2272 $value = $value * $self->{scale} + $self->{offset};
2154 2273
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2275 $self->{knob_w} = $knob_w;
2162 }); 2276 });
2163 2277
2164 $self->SUPER::update; 2278 $self->SUPER::update;
2165} 2279}
2166 2280
… …
2190 # draw handle 2304 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2306
2193 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2194} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2195 2350
2196############################################################################# 2351#############################################################################
2197 2352
2198package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2199 2354
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2397
2243 $self->reflow; 2398 $self->reflow;
2244} 2399}
2245 2400
2246sub text_height { 2401sub text_size {
2247 my ($self, $text, $indent) = @_; 2402 my ($self, $text, $indent) = @_;
2248 2403
2249 my $layout = $self->{layout}; 2404 my $layout = $self->{layout};
2250 2405
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2408 $layout->set_markup ($text);
2254 2409
2255 ($layout->size)[1] 2410 $layout->size
2256} 2411}
2257 2412
2258sub reflow { 2413sub reflow {
2259 my ($self) = @_; 2414 my ($self) = @_;
2260 2415
2261 $self->{need_reflow}++; 2416 $self->{need_reflow}++;
2262 $self->update; 2417 $self->update;
2263} 2418}
2264 2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
2265sub add_paragraph { 2435sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2267 2437
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2438 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2439 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2440 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2442 }
2275 2443
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2445}
2279 2446
2280sub update { 2447sub update {
2281 my ($self) = @_; 2448 my ($self) = @_;
2282 2449
… …
2285 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2286 2453
2287 delete $self->{texture}; 2454 delete $self->{texture};
2288 2455
2289 $ROOT->on_post_alloc ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2290 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2460 my $height = 0;
2292 2461
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2294 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2295 2477
2296 $self->{height} = $height; 2478 $self->{height} = $height;
2297 2479
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2481
2301 delete $self->{texture}; 2482 delete $self->{texture};
2302 } 2483 }
2303 2484
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2307 2488
2308 my $top = int $self->{children}[1]{range}[0]; 2489 my $top = int $self->{children}[1]{range}[0];
2309 2490
2310 my $y0 = $top; 2491 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2492 my $y1 = $top + $H;
2312 2493
2313 my $y = 0; 2494 my $y = 0;
2314 2495
2315 my $layout = $self->{layout}; 2496 my $layout = $self->{layout};
2316 2497
2317 $layout->set_font ($self->{font}) if $self->{font}; 2498 $layout->set_font ($self->{font}) if $self->{font};
2318 2499
2319 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2503
2322 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2505 my $h = $par->[1];
2324 2506
2325 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2508 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2509 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2510 $layout->set_markup ($par->[4]);
2329 2511
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2513
2332 glRasterPos $par->[2], $y - $y0; 2514 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2516 }
2335 2517
2336 $y += $h; 2518 $y += $h;
2337 } 2519 }
… …
2404 2586
2405sub new { 2587sub new {
2406 my $class = shift; 2588 my $class = shift;
2407 2589
2408 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2409 state => 0, 2591 state => 0,
2410 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2411 @_ 2593 @_
2412 ); 2594 );
2413 2595
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2596 $self
2420} 2597}
2421 2598
2422sub toggle_flopper { 2599sub toggle_flopper {
2423 my ($self) = @_; 2600 my ($self) = @_;
2424 2601
2425 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2603}
2437 2604
2438############################################################################# 2605#############################################################################
2439 2606
2440package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2453} 2620}
2454 2621
2455sub set_tooltip_from { 2622sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2457 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2458 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2637 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2639 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2651
2476sub size_allocate { 2652sub size_allocate {
2477 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2478 2654
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2480} 2674}
2481 2675
2482sub _draw { 2676sub _draw {
2483 my ($self) = @_; 2677 my ($self) = @_;
2484 2678
… …
2501 glVertex $w, $h; 2695 glVertex $w, $h;
2502 glVertex $w, 0; 2696 glVertex $w, 0;
2503 glEnd; 2697 glEnd;
2504 2698
2505 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2506 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2507} 2702}
2508 2703
2509############################################################################# 2704#############################################################################
2510 2705
… …
2516 2711
2517sub new { 2712sub new {
2518 my $class = shift; 2713 my $class = shift;
2519 2714
2520 my $self = $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2521 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2522 @_, 2718 @_,
2523 ); 2719 );
2524 2720
2525 if ($self->{anim} && $self->{animspeed}) { 2721 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2722 Scalar::Util::weaken (my $widget = $self);
… …
2541 2737
2542sub size_request { 2738sub size_request {
2543 (32, 8) 2739 (32, 8)
2544} 2740}
2545 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2546sub _draw { 2750sub _draw {
2547 my ($self) = @_; 2751 my ($self) = @_;
2548 2752
2549 return unless $::CONN;#d# manage and cache textures differently 2753 return unless $::CONN;
2550 2754
2551 my $face; 2755 my $face;
2552 2756
2553 if ($self->{frame}) { 2757 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}]; 2758 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2573 2777
2574 $self->{timer}->cancel 2778 $self->{timer}->cancel
2575 if $self->{timer}; 2779 if $self->{timer};
2576 2780
2577 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::InventoryItem;
2583
2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2611
2612sub new {
2613 my $class = shift;
2614
2615 my %args = @_;
2616
2617 my $item = delete $args{item};
2618
2619 my $desc = _item_to_desc ($item);
2620
2621 my $self = $class->SUPER::new (
2622 can_hover => 1,
2623 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2637 $::CONN->send ("move $targ $item->{tag} 0");
2638 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) {
2641 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2654 ),
2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658 }
2659
2660 1
2661 },
2662 %args
2663 );
2664
2665
2666 $self->add (new CFClient::UI::Face
2667 can_events => 0,
2668 face => $item->{face},
2669 anim => $item->{anim},
2670 animspeed => $item->{animspeed},
2671 );
2672
2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675 $self->{item} = $item;
2676
2677 $self->update_item;
2678
2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI::Inventory;
2693
2694our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox),
2701 @_,
2702 );
2703
2704 $self
2705}
2706
2707sub set_items {
2708 my ($self, $items) = @_;
2709
2710 $self->{scrolled}->clear;
2711 return unless $items;
2712
2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2717
2718 $self->{real_items} = \@items;
2719
2720 for my $item (@items) {
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2723 }
2724
2725 $self->{scrolled}->add (@items);
2726
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728}
2729
2730sub size_request {
2731 my ($self) = @_;
2732 ($self->{req_w}, $self->{req_h});
2733} 2782}
2734 2783
2735############################################################################# 2784#############################################################################
2736 2785
2737package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
… …
2772 2821
2773# popup given the event (must be a mouse button down event currently) 2822# popup given the event (must be a mouse button down event currently)
2774sub popup { 2823sub popup {
2775 my ($self, $ev) = @_; 2824 my ($self, $ev) = @_;
2776 2825
2777 $self->emit ("popdown"); 2826 $self->_emit ("popdown");
2778 2827
2779 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2780 $GRAB = $self; 2829 $GRAB = $self;
2781 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2782 2831
2783 $self->show; 2832 $self->show;
2784 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2785} 2834}
2786 2835
2787sub mouse_motion { 2836sub mouse_motion {
2788 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2789 2838
… …
2797 2846
2798 if ($ev->{button} == $self->{button}) { 2847 if ($ev->{button} == $self->{button}) {
2799 undef $GRAB; 2848 undef $GRAB;
2800 $self->hide; 2849 $self->hide;
2801 2850
2802 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2803 $self->{hover}[1]->() if $self->{hover}; 2852 $self->{hover}[1]->() if $self->{hover};
2804 } 2853 }
2805} 2854}
2806 2855
2807############################################################################# 2856#############################################################################
… …
2869sub add { 2918sub add {
2870 my ($self, $text, %arg) = @_; 2919 my ($self, $text, %arg) = @_;
2871 2920
2872 $text =~ s/^\s+//; 2921 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//; 2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2874 2925
2875 my $timeout = time + ((delete $arg{timeout}) || 60); 2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2876 2927
2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878 2929
… …
2912 $self->SUPER::reconfigure; 2963 $self->SUPER::reconfigure;
2913} 2964}
2914 2965
2915############################################################################# 2966#############################################################################
2916 2967
2917package CFClient::UI::Root; 2968package CFClient::UI::Inventory;
2918 2969
2919our @ISA = CFClient::UI::Container::; 2970our @ISA = CFClient::UI::ScrolledWindow::;
2920
2921use CFClient::OpenGL;
2922 2971
2923sub new { 2972sub new {
2924 my $class = shift; 2973 my $class = shift;
2925 2974
2926 $class->SUPER::new ( 2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2927 @_, 2977 @_,
2928 ) 2978 );
2929}
2930 2979
2931sub configure { 2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
2932 my ($self, $x, $y, $w, $h) = @_; 3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2933 3129
2934 $self->{w} = $w; 3130 $self->clear_command_list;
2935 $self->{h} = $h; 3131 $self->{recording} = 0;
2936} 3132 $self->{rec_btn}->set_text ("start recording");
2937 3133
2938sub check_size { 3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
2939 my ($self) = @_; 3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
2940 3152
2941 $self->size_allocate ($self->{w}, $self->{h}) 3153sub update_binding_widgets {
2942 if $self->{w}; 3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
3259package CFClient::UI::Root;
3260
3261our @ISA = CFClient::UI::Container::;
3262
3263use CFClient::OpenGL;
3264
3265sub new {
3266 my $class = shift;
3267
3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
2943} 3276}
2944 3277
2945sub size_request { 3278sub size_request {
2946 my ($self) = @_; 3279 my ($self) = @_;
2947 3280
2948 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
2949} 3296}
2950 3297
2951sub size_allocate { 3298sub size_allocate {
2952 my ($self, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2953 3300
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2960 for my $child ($self->children) { 3301 for my $child ($self->children) {
2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2962 3303
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3304 $X = $child->{force_x} if exists $child->{force_x};
2964 if exists $child->{req_x}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
2965 3306
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3307 $X = _to_pixel $X, $W, $self->{w};
2967 if exists $child->{req_y}; 3308 $Y = _to_pixel $Y, $H, $self->{h};
2968
2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971 3309
2972 $child->configure ($X, $Y, $W, $H); 3310 $child->configure ($X, $Y, $W, $H);
2973 } 3311 }
2974} 3312}
2975 3313
… …
2986} 3324}
2987 3325
2988sub update { 3326sub update {
2989 my ($self) = @_; 3327 my ($self) = @_;
2990 3328
2991 $self->check_size;
2992 $::WANT_REFRESH++; 3329 $::WANT_REFRESH++;
2993} 3330}
2994 3331
2995sub add { 3332sub add {
2996 my ($self, @children) = @_; 3333 my ($self, @children) = @_;
2997 3334
2998 for my $child (@children) {
2999 $child->{toplevel} = 1; 3335 $_->{is_toplevel} = 1
3000 3336 for @children;
3001 # integerise window positions
3002 $child->{x} = int $child->{x};
3003 $child->{y} = int $child->{y};
3004 }
3005 3337
3006 $self->SUPER::add (@children); 3338 $self->SUPER::add (@children);
3339}
3340
3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
3007} 3354}
3008 3355
3009sub on_refresh { 3356sub on_refresh {
3010 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
3011 3358
… …
3024 while ($self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
3025 $_->() 3372 $_->()
3026 for values %{delete $self->{refresh_hook}}; 3373 for values %{delete $self->{refresh_hook}};
3027 } 3374 }
3028 3375
3029 if ($self->{check_size}) { 3376 if ($self->{realloc}) {
3030 my @queue = ([], []); 3377 my @queue;
3031 3378
3032 for (;;) { 3379 while () {
3033 if ($self->{check_size}) { 3380 if ($self->{realloc}) {
3034 # heuristic: check containers last 3381 #TODO use array-of-depth approach
3035 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3382
3036 for values %{delete $self->{check_size}} 3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
3037 } 3387 }
3038 3388
3039 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3389 my $widget = pop @queue || last;
3040 3390
3041 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3391 $widget->{visible} or last; # do not resize invisible widgets
3042 ? @$widget{qw(user_w user_h)} 3392
3043 : $widget->size_request; 3393 my ($w, $h) = $widget->size_request;
3044 3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3045 if (delete $widget->{force_alloc} 3402 || delete $widget->{force_realloc}) {
3046 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3048
3049 $widget->{req_w} = $w; 3403 $widget->{req_w} = $w;
3050 $widget->{req_h} = $h; 3404 $widget->{req_h} = $h;
3051 3405
3052 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3406 $self->{size_alloc}{$widget+0} = $widget;
3053 3407
3054 $widget->{parent}->check_size
3055 if $widget->{parent}; 3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3056 } 3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3057 } 3417 }
3058 } 3418 }
3059 3419
3060 while ($self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
3061 for (values %{delete $self->{size_alloc}}) { 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3062 my ($widget, $w, $h) = @$_; 3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3063 3428
3064 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
3065 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
3066 3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3067 $widget->{w} = $w; 3436 $widget->{w} = $w;
3068 $widget->{h} = $h; 3437 $widget->{h} = $h;
3069 $widget->size_allocate ($w, $h); 3438
3070 $widget->emit (size_allocate => $w, $h); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
3071 } 3441 }
3072 } 3442 }
3073 3443
3074 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
3075 $_->() 3445 $_->()
3076 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
3077 } 3447 }
3448
3078 3449
3079 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3081 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
3082 3453

Diff Legend

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