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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

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

Diff Legend

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