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.213 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 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) = @_;
… …
136 $rem += $_ - $i; 148 $rem += $_ - $i;
137 $_ = $i; 149 $_ = $i;
138 } 150 }
139} 151}
140 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
141# call when resolution changes etc. 169# call when resolution changes etc.
142sub rescale_widgets { 170sub rescale_widgets {
143 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
144 172
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 173 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 188 }
159
160 $widget->reconfigure;
161 } 189 }
190
191 reconfigure_widgets;
162} 192}
163 193
164############################################################################# 194#############################################################################
165 195
166package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
171 201
172sub new { 202sub new {
173 my $class = shift; 203 my $class = shift;
174 204
175 my $self = bless { 205 my $self = bless {
176 x => 0, 206 x => "center",
177 y => 0, 207 y => "center",
178 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
179 can_events => 1, 211 can_events => 1,
180 @_ 212 @_
181 }, $class; 213 }, $class;
182 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
183 for (keys %$self) { 217 for (keys %$self) {
184 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
186 } 220 }
187 } 221 }
188 222
189 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->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{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 }
190 234
191 $self 235 $self
192} 236}
193 237
194sub destroy { 238sub destroy {
… …
204 return if $self->{parent}; 248 return if $self->{parent};
205 249
206 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
207} 251}
208 252
209sub hide { 253sub set_visible {
210 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
211 277
212 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
216 if $self->{parent}; 312 if $self->{parent};
217} 313}
218 314
219sub move { 315sub move_abs {
220 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
221 317
222 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
225 321
226 $self->update; 322 $self->update;
227} 323}
228 324
229sub set_size { 325sub set_size {
230 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
231 327
232 $self->{user_w} = $w; 328 $self->{force_w} = $w;
233 $self->{user_h} = $h; 329 $self->{force_h} = $h;
234 330
235 $self->check_size; 331 $self->realloc;
236} 332}
237 333
238sub size_request { 334sub size_request {
239 require Carp; 335 require Carp;
240 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
242 338
243sub configure { 339sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
245 341
246 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
249 347
250 # use alignment to adjust x, y 348 # use alignment to adjust x, y
251 349
252 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 352 }
257 353
258 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 355 $self->{x} = $x;
260 $self->{y} = $y; 356 $self->{y} = $y;
261 $self->update; 357 $self->update;
262 } 358 }
263 359
264 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
266 } 364 }
267} 365}
268 366
269sub size_allocate { 367sub size_allocate {
270 # nothing to be done 368 # nothing to be done
271} 369}
272 370
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 371sub children {
281} 372}
282 373
283sub set_max_size { 374sub set_max_size {
284 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 379}
289 380
290sub set_tooltip { 381sub set_tooltip {
291 my ($self, $tooltip) = @_; 382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
292 388
293 $self->{tooltip} = $tooltip; 389 $self->{tooltip} = $tooltip;
294 390
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 392 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 414 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
320 416
321 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
322 418
323 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
324 420
325 $focus->update if $focus; 421 $focus->update if $focus;
326 $FOCUS->update; 422 $FOCUS->update;
327} 423}
328 424
… …
331 427
332 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
333 429
334 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
335 431
336 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
337 433
338 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
339} 438}
340 439
341sub mouse_motion { } 440sub mouse_motion { }
342sub button_up { } 441sub button_up { }
343sub key_down { } 442sub key_down { }
344sub key_up { } 443sub key_up { }
345 444
346sub button_down { 445sub button_down {
347 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
348 447
349 $self->focus_in; 448 $self->focus_in;
… …
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
357 525
358sub draw { 526sub draw {
359 my ($self) = @_; 527 my ($self) = @_;
360 528
361 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
378 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
379 glEnd; 547 glEnd;
380 glDisable GL_BLEND; 548 glDisable GL_BLEND;
381 } 549 }
382 550
383 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
384 glPushMatrix; 552 glPushMatrix;
385 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 556 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
392 glEnd; 560 glEnd;
393 glPopMatrix; 561 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 563 }
396} 564}
397 565
398sub _draw { 566sub _draw {
399 my ($self) = @_; 567 my ($self) = @_;
400 568
401 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 570}
451 571
452sub DESTROY { 572sub DESTROY {
453 my ($self) = @_; 573 my ($self) = @_;
454 574
… …
512 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
514} 634}
515 635
516sub size_request { 636sub size_request {
517 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
518} 640}
519 641
520sub draw { } 642sub draw { }
521 643
522############################################################################# 644#############################################################################
… …
551 $self->{children} = [ 673 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
554 ]; 676 ];
555 677
556 $self->check_size (1); 678 $self->realloc;
557 $self->update;
558} 679}
559 680
560sub children { 681sub children {
561 @{ $_[0]{children} } 682 @{ $_[0]{children} }
562} 683}
… …
567 delete $child->{parent}; 688 delete $child->{parent};
568 $child->hide; 689 $child->hide;
569 690
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 692
572 $self->check_size; 693 $self->realloc;
573 $self->update;
574} 694}
575 695
576sub clear { 696sub clear {
577 my ($self) = @_; 697 my ($self) = @_;
578 698
… …
582 for (@$children) { 702 for (@$children) {
583 delete $_->{parent}; 703 delete $_->{parent};
584 $_->hide; 704 $_->hide;
585 } 705 }
586 706
587 $self->check_size; 707 $self->realloc;
588 $self->update;
589} 708}
590 709
591sub find_widget { 710sub find_widget {
592 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
593 712
… …
646sub size_request { 765sub size_request {
647 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
648} 767}
649 768
650sub size_allocate { 769sub size_allocate {
651 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
652 771
653 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
654} 773}
655 774
656############################################################################# 775#############################################################################
… …
673 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
674 $self->SUPER::update; 793 $self->SUPER::update;
675} 794}
676 795
677sub size_allocate { 796sub size_allocate {
678 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
679 798
680 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
681 $self->update; 800 $self->update
801 if $changed;
682} 802}
683 803
684sub _render { 804sub _render {
685 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
686} 806}
… …
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 812 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
694 814
695 $self->_render; 815 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 816 };
704} 817}
705 818
706sub _draw { 819sub _draw {
707 my ($self) = @_; 820 my ($self) = @_;
… …
711 my $tex = $self->{texture} 824 my $tex = $self->{texture}
712 or return; 825 or return;
713 826
714 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 829 glColor 1, 1, 1, 1;
717 830
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 832
720 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
721} 834}
… …
724 837
725package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
726 839
727our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
728 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
729sub size_request { 852sub size_request {
730 my ($self) = @_; 853 my ($self) = @_;
731 854
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 856
735 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
736} 861}
737 862
738sub size_allocate { 863sub size_allocate {
739 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
740 865
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
869 $self->child->configure (0, 0, $w, $h);
741 $self->update; 870 $self->update;
742} 871}
743 872
744sub set_offset { 873sub set_offset {
745 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
796 my $class = shift; 925 my $class = shift;
797 926
798 my $self; 927 my $self;
799 928
800 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
801 vertical => 1, 930 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 932 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 933 $self->{vp}->set_offset (0, $_[1]);
805 }, 934 },
806 ; 935 ;
807 936
808 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 938 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 939 slider => $slider,
811 @_, 940 @_,
812 ); 941 );
813 942
814 $self->{vp}->add ($self->{scrolled}); 943 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 944 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
817 946
818 $self 947 $self
948}
949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819} 967}
820 968
821#TODO# update range on size_allocate depending on child 969#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 970# update viewport offset on scroll
823 971
… …
867 1015
868our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
869 1017
870use CFClient::OpenGL; 1018use CFClient::OpenGL;
871 1019
872my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875 1027
876sub new { 1028sub new {
877 my $class = shift; 1029 my $class = shift;
878 1030
879 # TODO: user_x, user_y, overwrite moveto?
880
881 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1034 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
887 @_ 1038 @_
888 ); 1039 );
889 1040
890 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 1042 align => 0,
… …
910 $h + $self->border * 2, 1061 $h + $self->border * 2,
911 ) 1062 )
912} 1063}
913 1064
914sub size_allocate { 1065sub size_allocate {
915 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
916 1069
917 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
919 1072
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
944 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
945 1098
946 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
948 1101
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size;
953 }; 1107 };
954 1108
955 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1113 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
961 1115
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
963 1117
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update;
966 }; 1119 };
967 } 1120 }
968} 1121}
969 1122
970sub button_up { 1123sub button_up {
… …
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1143
991 my $border = $self->border; 1144 my $border = $self->border;
992 1145
993 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1151
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
1001 1154
1002 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1160 }
1013 1161
1014 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1015 1163
… …
1031sub new { 1179sub new {
1032 my $class = shift; 1180 my $class = shift;
1033 1181
1034 $class->SUPER::new ( 1182 $class->SUPER::new (
1035 col_expand => [], 1183 col_expand => [],
1036 @_ 1184 @_,
1037 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1190}
1039 1191
1040sub add { 1192sub add {
1041 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1042 1194
1043 $child->set_parent ($self); 1195 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1045 1197
1046 $child->check_size; 1198 $self->realloc;
1047} 1199}
1048 1200
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1054sub clear { 1202sub clear {
1055 my ($self) = @_; 1203 my ($self) = @_;
1056 1204
1057 my @children = $self->children; 1205 my @children = $self->children;
1058 delete $self->{children}; 1206 delete $self->{children};
… …
1060 for (@children) { 1208 for (@children) {
1061 delete $_->{parent}; 1209 delete $_->{parent};
1062 $_->hide; 1210 $_->hide;
1063 } 1211 }
1064 1212
1065 $self->update; 1213 $self->realloc;
1066} 1214}
1067 1215
1068sub get_wh { 1216sub get_wh {
1069 my ($self) = @_; 1217 my ($self) = @_;
1070 1218
… …
1097 (sum @$hs), 1245 (sum @$hs),
1098 ) 1246 )
1099} 1247}
1100 1248
1101sub size_allocate { 1249sub size_allocate {
1102 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1103 1251
1104 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1105 1253
1106 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1108 1256
1109 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1314 }
1167} 1315}
1168 1316
1169############################################################################# 1317#############################################################################
1170 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
1171package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1172 1380
1173# TODO: wrap into common Box base class
1174
1175our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1176 1382
1177sub size_request { 1383sub new {
1178 my ($self) = @_; 1384 my $class = shift;
1179 1385
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1181 1387 vertical => 0,
1182 ( 1388 @_,
1183 (List::Util::sum map $_->[0], @alloc),
1184 (List::Util::max map $_->[1], @alloc),
1185 ) 1389 )
1186} 1390}
1187 1391
1188sub size_allocate {
1189 my ($self, $w, $h) = @_;
1190
1191 ($h, $w) = ($w, $h);
1192
1193 my $children = $self->{children};
1194
1195 my @h = map $_->{req_w}, @$children;
1196
1197 my $req_h = List::Util::sum @h;
1198
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } else {
1203 my $exp = List::Util::sum map $_->{expand}, @$children;
1204 $exp ||= 1;
1205
1206 for (0 .. $#$children) {
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 }
1213 }
1214
1215 CFClient::UI::harmonize \@h;
1216
1217 my $y = 0;
1218 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_];
1221 $child->configure ($y, 0, $h, $w);
1222
1223 $y += $h;
1224 }
1225
1226 1
1227}
1228
1229############################################################################# 1392#############################################################################
1230 1393
1231package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1232 1395
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1236 1397
1237sub size_request { 1398sub new {
1238 my ($self) = @_; 1399 my $class = shift;
1239 1400
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1241 1402 vertical => 1,
1242 ( 1403 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1404 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1405}
1286 1406
1287############################################################################# 1407#############################################################################
1288 1408
1289package CFClient::UI::Label; 1409package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1426 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1308 fontsize => 1, 1428 fontsize => 1,
1309 align => -1, 1429 align => -1,
1310 valign => -1, 1430 valign => -1,
1311 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1312 can_events => 0, 1433 can_events => 0,
1313 %arg 1434 %arg
1314 ); 1435 );
1315 1436
1316 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1353 1474
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1356 1477
1478 $self->realloc;
1357 $self->update; 1479 $self->update;
1358 $self->check_size;
1359} 1480}
1360 1481
1361sub set_markup { 1482sub set_markup {
1362 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1363 1484
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1489
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1371 1492
1493 $self->realloc;
1372 $self->update; 1494 $self->update;
1373 $self->check_size;
1374} 1495}
1375 1496
1376sub size_request { 1497sub size_request {
1377 my ($self) = @_; 1498 my ($self) = @_;
1378 1499
… …
1392 1513
1393 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1395 } 1516 }
1396 1517
1397 ( 1518 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1519}
1402 1520
1403sub size_allocate { 1521sub size_allocate {
1404 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1405 1523
1406 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1407} 1526}
1408 1527
1409sub set_fontsize { 1528sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1411 1530
1412 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1532 delete $self->{texture};
1414 1533
1415 $self->update; 1534 $self->realloc;
1416 $self->check_size;
1417} 1535}
1418 1536
1419sub _draw { 1537sub _draw {
1420 my ($self) = @_; 1538 my ($self) = @_;
1421 1539
… …
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1549
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433 1551
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1437 1555
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1441 1559
1442 $tex 1560 $tex
1443 }; 1561 };
1444 1562
… …
1473 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1474 can_hover => 1, 1592 can_hover => 1,
1475 can_focus => 1, 1593 can_focus => 1,
1476 valign => 0, 1594 valign => 0,
1477 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1478 @_ 1597 @_
1479 ) 1598 )
1480} 1599}
1481 1600
1482sub _set_text { 1601sub _set_text {
… …
1492 $self->{text} = $text; 1611 $self->{text} = $text;
1493 1612
1494 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1496 1615
1497 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1498} 1617}
1499 1618
1500sub set_text { 1619sub set_text {
1501 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1502 1621
1503 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1623 $self->_set_text ($text);
1505 $self->update; 1624
1506 $self->check_size; 1625 $self->realloc;
1507} 1626}
1508 1627
1509sub get_text { 1628sub get_text {
1510 $_[0]{text} 1629 $_[0]{text}
1511} 1630}
… …
1514 my ($self) = @_; 1633 my ($self) = @_;
1515 1634
1516 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1517 1636
1518 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1638}
1526 1639
1527sub key_down { 1640sub key_down {
1528 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1529 1642
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1661 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1662 $self->_emit ('escape');
1550 } elsif ($uni) { 1663 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1665 }
1553 1666
1554 $self->_set_text ($text); 1667 $self->_set_text ($text);
1555 $self->update; 1668
1556 $self->check_size; 1669 $self->realloc;
1557} 1670}
1558 1671
1559sub focus_in { 1672sub focus_in {
1560 my ($self) = @_; 1673 my ($self) = @_;
1561 1674
… …
1641 if ($sym == 13) { 1754 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1647 $self->update; 1760 $self->update;
1648 1761
1649 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1688 1801
1689sub new { 1802sub new {
1690 my $class = shift; 1803 my $class = shift;
1691 1804
1692 $class->SUPER::new ( 1805 $class->SUPER::new (
1693 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1694 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1696 can_hover => 1, 1810 can_hover => 1,
1697 align => 0, 1811 align => 0,
1698 valign => 0, 1812 valign => 0,
1699 can_events => 1, 1813 can_events => 1,
1700 @_ 1814 @_
1701 ) 1815 )
1702} 1816}
1703 1817
1818sub activate { }
1819
1704sub button_up { 1820sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1706 1822
1823 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1826}
1712 1827
1713sub _draw { 1828sub _draw {
1714 my ($self) = @_; 1829 my ($self) = @_;
1715 1830
… …
1744 1859
1745sub new { 1860sub new {
1746 my $class = shift; 1861 my $class = shift;
1747 1862
1748 $class->SUPER::new ( 1863 $class->SUPER::new (
1749 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1750 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1868 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1869 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1870 state => 0,
… …
1758} 1874}
1759 1875
1760sub size_request { 1876sub size_request {
1761 my ($self) = @_; 1877 my ($self) = @_;
1762 1878
1763 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1764} 1880}
1765 1881
1766sub button_down { 1882sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1768 1884
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1773 } 1889 }
1774} 1890}
1775 1891
1776sub _draw { 1892sub _draw {
1777 my ($self) = @_; 1893 my ($self) = @_;
1778 1894
1779 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1780 1896
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1898
1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1784 1902
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1904
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1906
… …
2052 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2173 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2174 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2060 vertical => 0, 2178 vertical => 0,
2061 can_hover => 1, 2179 can_hover => 1,
2062 inner_pad => .05, 2180 inner_pad => 0.02,
2063 @_ 2181 @_
2064 ); 2182 );
2065 2183
2066 $self->set_value ($self->{range}[0]); 2184 $self->set_value ($self->{range}[0]);
2067 $self->update; 2185 $self->update;
2068 2186
2069 $self 2187 $self
2070} 2188}
2071 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2072sub set_value { 2201sub set_value {
2073 my ($self, $value) = @_; 2202 my ($self, $value) = @_;
2074 2203
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2205
2077 $hi = $lo + 1 if $hi <= $lo; 2206 $hi = $lo + 1 if $hi <= $lo;
2078 2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2079 $value = $lo if $value < $lo; 2210 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2211 $value = $hi - $page if $value > $hi - $page;
2081 2212
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2214 if $unit;
2084 2215
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2217
2089 if ($value != $old_value) { 2218 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2219 $self->_emit (changed => $value);
2091 $self->update; 2220 $self->update;
2092 } 2221 }
2093} 2222}
2094 2223
2095sub size_request { 2224sub size_request {
2096 my ($self) = @_; 2225 my ($self) = @_;
2097 2226
2098 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2228}
2103 2229
2104sub button_down { 2230sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2106 2232
2107 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
2108 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
2109} 2238}
2110 2239
2111sub mouse_motion { 2240sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2245
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2247
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2249
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2251 }
2123} 2252}
2124 2253
2125sub update { 2254sub update {
2126 my ($self) = @_; 2255 my ($self) = @_;
2127 2256
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2258 $self->set_value ($self->{range}[0]);
2130 2259
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2132 2262
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2264
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2267
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2268 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2269 $value = $value * $self->{scale} + $self->{offset};
2139 2270
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2272 $self->{knob_w} = $knob_w;
2147 }); 2273 });
2148 2274
2149 $self->SUPER::update; 2275 $self->SUPER::update;
2150} 2276}
2151 2277
… …
2157 glScale $self->{w}, $self->{h}; 2283 glScale $self->{w}, $self->{h};
2158 2284
2159 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2160 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2161 2287
2288 glTranslate 1, 0, 0;
2162 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2163 glTranslate 0, 1, 0;
2164 } 2290 }
2165 2291
2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2168 2294
… …
2175 # draw handle 2301 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2303
2178 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2179} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
2180 2347
2181############################################################################# 2348#############################################################################
2182 2349
2183package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2184 2351
… …
2214 2381
2215 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2383 $self->reflow;
2217} 2384}
2218 2385
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2386sub size_allocate {
2239 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2240 2388
2241 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2242 2392
2243 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2396
2247 $self->reflow; 2397 $self->reflow;
2248} 2398}
2249 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2250sub add_paragraph { 2434sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2252 2436
2253 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2254 2438 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2258 2442
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2444}
2264 2445
2265sub update { 2446sub update {
2266 my ($self) = @_; 2447 my ($self) = @_;
2267 2448
… …
2270 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2271 2452
2272 delete $self->{texture}; 2453 delete $self->{texture};
2273 2454
2274 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2275 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2459 my $height = 0;
2277 2460
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2279 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2280 2476
2281 $self->{height} = $height; 2477 $self->{height} = $height;
2282 2478
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2480
2285 delete $self->{texture}; 2481 delete $self->{texture};
2286 } 2482 }
2287 2483
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2291 2487
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2296 2489
2297 my $y0 = $top; 2490 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2299 2492
2300 my $y = 0; 2493 my $y = 0;
2301 2494
2302 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2303 2496
2304 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2305 2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2306 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2504 my $h = $par->[1];
2308 2505
2309 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2312 2510
2313 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2512
2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2515 }
2316 2516
2317 $y += $h; 2517 $y += $h;
2318 } 2518 }
2319 2519
2320 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2321 }; 2521 };
2322 }); 2522 });
2323} 2523}
2324 2524
2325sub _draw { 2525sub _draw {
2326 my ($self) = @_; 2526 my ($self) = @_;
2327 2527
2328 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2333 2533
2334 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2335 2535
2336} 2536}
… …
2385 2585
2386sub new { 2586sub new {
2387 my $class = shift; 2587 my $class = shift;
2388 2588
2389 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2390 state => 0, 2590 state => 0,
2391 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2392 @_ 2592 @_
2393 ); 2593 );
2394 2594
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2595 $self
2401} 2596}
2402 2597
2403sub toggle_flopper { 2598sub toggle_flopper {
2404 my ($self) = @_; 2599 my ($self) = @_;
2405 2600
2406 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2602}
2418 2603
2419############################################################################# 2604#############################################################################
2420 2605
2421package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2453 2638
2454 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2455} 2640}
2456 2641
2457sub size_allocate { 2642sub size_allocate {
2458 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2459 2644
2645 return unless $changed;
2646
2460 $self->SUPER::size_allocate ($w - 4, $h - 4); 2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2461} 2666}
2462 2667
2463sub _draw { 2668sub _draw {
2464 my ($self) = @_; 2669 my ($self) = @_;
2465 2670
… …
2482 glVertex $w, $h; 2687 glVertex $w, $h;
2483 glVertex $w, 0; 2688 glVertex $w, 0;
2484 glEnd; 2689 glEnd;
2485 2690
2486 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2487 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2488} 2694}
2489 2695
2490############################################################################# 2696#############################################################################
2491 2697
… …
2496use CFClient::OpenGL; 2702use CFClient::OpenGL;
2497 2703
2498sub new { 2704sub new {
2499 my $class = shift; 2705 my $class = shift;
2500 2706
2501 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2502 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2503 @_, 2710 @_,
2504 ) 2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2505} 2728}
2506 2729
2507sub size_request { 2730sub size_request {
2508 (32, 8) 2731 (32, 8)
2509} 2732}
2510 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2511sub _draw { 2742sub _draw {
2512 my ($self) = @_; 2743 my ($self) = @_;
2513 2744
2514 return unless $::CONN;#d# manage and cache textures differently 2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2757
2517 # TODO animation
2518 if ($tex) { 2758 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2524 } 2764 }
2525} 2765}
2526 2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2527############################################################################# 2776#############################################################################
2528 2777
2529package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2530 2779
2531our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558 2781
2559sub new { 2782sub new {
2560 my $class = shift; 2783 my $class = shift;
2561 2784
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2569 can_hover => 1, 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_, 2787 @_,
2644 ); 2788 );
2645 2789
2646 $self 2790 $self
2647} 2791}
… …
2657 or ($a->{name} cmp $b->{name}) 2801 or ($a->{name} cmp $b->{name})
2658 } @$items; 2802 } @$items;
2659 2803
2660 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2661 2805
2806 my $row = 0;
2662 for my $item (@items) { 2807 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2808 CFClient::Item::update_widgets $item;
2664 $item->update_item ();
2665 }
2666 2809
2667 $self->{scrolled}->add (@items); 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2668 2813
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2814 $row++;
2670} 2815 }
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675} 2816}
2676 2817
2677############################################################################# 2818#############################################################################
2678 2819
2679package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2714 2855
2715# popup given the event (must be a mouse button down event currently) 2856# popup given the event (must be a mouse button down event currently)
2716sub popup { 2857sub popup {
2717 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2718 2859
2719 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2720 2861
2721 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2863 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2724 2865
2725 $self->show; 2866 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727} 2868}
2728 2869
2729sub mouse_motion { 2870sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2731 2872
… …
2739 2880
2740 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2882 undef $GRAB;
2742 $self->hide; 2883 $self->hide;
2743 2884
2744 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2746 } 2887 }
2747} 2888}
2748 2889
2749############################################################################# 2890#############################################################################
… …
2811sub add { 2952sub add {
2812 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2813 2954
2814 $text =~ s/^\s+//; 2955 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2816 2959
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 2961
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 2963
… …
2863use CFClient::OpenGL; 3006use CFClient::OpenGL;
2864 3007
2865sub new { 3008sub new {
2866 my $class = shift; 3009 my $class = shift;
2867 3010
2868 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
2869 @_, 3013 @_,
2870 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
2871} 3019}
2872 3020
2873sub configure { 3021sub configure {
2874 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2875 3023
2876 $self->{w} = $w; 3024 $self->{w} = $w;
2877 $self->{h} = $h; 3025 $self->{h} = $h;
2878} 3026}
2879 3027
2880sub check_size { 3028sub reconfigure {
2881 my ($self) = @_; 3029 my ($self) = @_;
2882 3030
3031 $self->SUPER::reconfigure;
3032
2883 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
2884 if $self->{w}; 3034 if $self->{w};
2885} 3035}
2886 3036
2887sub size_request { 3037sub size_request {
2888 my ($self) = @_; 3038 my ($self) = @_;
2889 3039
2890 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
2891} 3041}
2892 3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
2893sub size_allocate { 3057sub size_allocate {
2894 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
2895
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901 3059
2902 for my $child ($self->children) { 3060 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3062
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
2907 3065
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3068
2914 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
2915 } 3070 }
2916} 3071}
2917 3072
… …
2928} 3083}
2929 3084
2930sub update { 3085sub update {
2931 my ($self) = @_; 3086 my ($self) = @_;
2932 3087
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
2935} 3089}
2936 3090
2937sub add { 3091sub add {
2938 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
2939 3093
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3094 $_->{is_toplevel} = 1
2942 3095 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3096
2948 $self->SUPER::add (@children); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2949} 3113}
2950 3114
2951sub on_refresh { 3115sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2953 3117
… …
2966 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2967 $_->() 3131 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
2969 } 3133 }
2970 3134
2971 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
2972 my @queue = ([], []); 3136 my @queue;
2973 3137
2974 for (;;) { 3138 while () {
2975 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
2976 # heuristic: check containers last 3140 #TODO use array-of-depth approach
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
2978 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
2979 } 3144 }
2980 3145
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
2982 3147
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
2984 ? @$widget{qw(user_w user_h)} 3149
2985 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
2986 3151
2987 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
2990 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
2991 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
2993 3160
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2995 3162
2996 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
2997 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2998 }
2999 } 3165 }
3000 } 3166 }
3001 3167
3002 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3004 my ($widget, $w, $h) = @$_; 3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3005 3177
3006 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
3008 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3009 $widget->{w} = $w; 3186 $widget->{w} = $w;
3010 $widget->{h} = $h; 3187 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3188
3012 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
3013 } 3190 }
3014 } 3191 }
3015 3192
3016 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
3017 $_->() 3194 $_->()
… …
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
3024 3201
3025 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3203 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3206 glLoadIdentity;
3030 3207
3031 $self->_draw; 3208 $self->_draw;
3032} 3209}

Diff Legend

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