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.229 by root, Wed May 24 21:49:58 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) = @_;
… …
144 156
145 $_->update 157 $_->update
146 for @widgets; 158 for @widgets;
147} 159}
148 160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
149# call when resolution changes etc. 169# call when resolution changes etc.
150sub rescale_widgets { 170sub rescale_widgets {
151 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
152 172
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 173 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
166 } 188 }
167
168 $widget->reconfigure;
169 } 189 }
190
191 reconfigure_widgets;
170} 192}
171 193
172############################################################################# 194#############################################################################
173 195
174package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
179 201
180sub new { 202sub new {
181 my $class = shift; 203 my $class = shift;
182 204
183 my $self = bless { 205 my $self = bless {
184 x => 0, 206 x => "center",
185 y => 0, 207 y => "center",
186 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
187 can_events => 1, 211 can_events => 1,
188 @_ 212 @_
189 }, $class; 213 }, $class;
190 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
191 for (keys %$self) { 217 for (keys %$self) {
192 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
194 } 220 }
195 } 221 }
196 222
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{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 }
198 234
199 $self 235 $self
200} 236}
201 237
202sub destroy { 238sub destroy {
… …
206 %$self = (); 242 %$self = ();
207} 243}
208 244
209sub show { 245sub show {
210 my ($self) = @_; 246 my ($self) = @_;
247
211 return if $self->{parent}; 248 return if $self->{parent};
212 249
213 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
214} 251}
215 252
216sub show_centered { 253sub set_visible {
217 my ($self) = @_; 254 my ($self) = @_;
255
218 return if $self->{parent}; 256 return if $self->{visible};
219 257
220 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
221 260
222 $CFClient::UI::ROOT->on_post_alloc ( 261 $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 262
229sub hide { 263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
230 my ($self) = @_; 269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
231 277
232 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
234 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
235 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
236 if $self->{parent}; 312 if $self->{parent};
237} 313}
238 314
239sub move { 315sub move_abs {
240 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
241 317
242 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
245 321
246 $self->update; 322 $self->update;
247} 323}
248 324
249sub set_size { 325sub set_size {
250 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
251 327
252 $self->{user_w} = $w; 328 $self->{force_w} = $w;
253 $self->{user_h} = $h; 329 $self->{force_h} = $h;
254 330
255 $self->check_size; 331 $self->realloc;
256} 332}
257 333
258sub size_request { 334sub size_request {
259 require Carp; 335 require Carp;
260 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
262 338
263sub configure { 339sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
265 341
266 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
269 347
270 # use alignment to adjust x, y 348 # use alignment to adjust x, y
271 349
272 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 352 }
277 353
278 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 355 $self->{x} = $x;
280 $self->{y} = $y; 356 $self->{y} = $y;
281 $self->update; 357 $self->update;
282 } 358 }
283 359
284 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
286 } 364 }
287} 365}
288 366
289sub size_allocate { 367sub size_allocate {
290 # nothing to be done 368 # nothing to be done
291} 369}
292 370
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 371sub children {
301} 372}
302 373
303sub set_max_size { 374sub set_max_size {
304 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 379}
309 380
310sub set_tooltip { 381sub set_tooltip {
311 my ($self, $tooltip) = @_; 382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
312 388
313 $self->{tooltip} = $tooltip; 389 $self->{tooltip} = $tooltip;
314 390
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 392 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 414 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
340 416
341 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
342 418
343 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
344 420
345 $focus->update if $focus; 421 $focus->update if $focus;
346 $FOCUS->update; 422 $FOCUS->update;
347} 423}
348 424
… …
351 427
352 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
353 429
354 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
355 431
356 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
357 433
358 $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;
359} 438}
360 439
361sub mouse_motion { } 440sub mouse_motion { }
362sub button_up { } 441sub button_up { }
363sub key_down { } 442sub key_down { }
364sub key_up { } 443sub key_up { }
365 444
366sub button_down { 445sub button_down {
367 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
368 447
369 $self->focus_in; 448 $self->focus_in;
… …
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376sub 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}
377 525
378sub draw { 526sub draw {
379 my ($self) = @_; 527 my ($self) = @_;
380 528
381 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
398 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
399 glEnd; 547 glEnd;
400 glDisable GL_BLEND; 548 glDisable GL_BLEND;
401 } 549 }
402 550
403 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
404 glPushMatrix; 552 glPushMatrix;
405 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 556 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
412 glEnd; 560 glEnd;
413 glPopMatrix; 561 glPopMatrix;
414 #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;
415 } 563 }
416} 564}
417 565
418sub _draw { 566sub _draw {
419 my ($self) = @_; 567 my ($self) = @_;
420 568
421 warn "no draw defined for $self\n"; 569 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} 570}
473 571
474sub DESTROY { 572sub DESTROY {
475 my ($self) = @_; 573 my ($self) = @_;
476 574
… …
534 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
536} 634}
537 635
538sub size_request { 636sub size_request {
539 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
540} 640}
541 641
542sub draw { } 642sub draw { }
543 643
544############################################################################# 644#############################################################################
… …
573 $self->{children} = [ 673 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
576 ]; 676 ];
577 677
578 $self->check_size (1); 678 $self->realloc;
579 $self->update;
580} 679}
581 680
582sub children { 681sub children {
583 @{ $_[0]{children} } 682 @{ $_[0]{children} }
584} 683}
… …
589 delete $child->{parent}; 688 delete $child->{parent};
590 $child->hide; 689 $child->hide;
591 690
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 692
594 $self->check_size; 693 $self->realloc;
595 $self->update;
596} 694}
597 695
598sub clear { 696sub clear {
599 my ($self) = @_; 697 my ($self) = @_;
600 698
… …
604 for (@$children) { 702 for (@$children) {
605 delete $_->{parent}; 703 delete $_->{parent};
606 $_->hide; 704 $_->hide;
607 } 705 }
608 706
609 $self->check_size; 707 $self->realloc;
610 $self->update;
611} 708}
612 709
613sub find_widget { 710sub find_widget {
614 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
615 712
… …
668sub size_request { 765sub size_request {
669 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
670} 767}
671 768
672sub size_allocate { 769sub size_allocate {
673 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
674 771
675 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
676} 773}
677 774
678############################################################################# 775#############################################################################
… …
695 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
696 $self->SUPER::update; 793 $self->SUPER::update;
697} 794}
698 795
699sub size_allocate { 796sub size_allocate {
700 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
701 798
702 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
703 $self->update; 800 $self->update
801 if $changed;
704} 802}
705 803
706sub _render { 804sub _render {
707 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
708} 806}
… …
739 837
740package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
741 839
742our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
743 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
744sub size_request { 852sub size_request {
745 my ($self) = @_; 853 my ($self) = @_;
746 854
747 @$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)};
748 856
749 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
750} 861}
751 862
752sub size_allocate { 863sub size_allocate {
753 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
754 865
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
757 $self->child->configure (0, 0, $cw, $ch); 869 $self->child->configure (0, 0, $w, $h);
758 $self->update; 870 $self->update;
759} 871}
760 872
761sub set_offset { 873sub set_offset {
762 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 925 my $class = shift;
814 926
815 my $self; 927 my $self;
816 928
817 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
818 vertical => 1, 930 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 932 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1]); 933 $self->{vp}->set_offset (0, $_[1]);
822 }, 934 },
823 ; 935 ;
824 936
825 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
… …
833 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
834 946
835 $self 947 $self
836} 948}
837 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
838sub size_allocate { 960sub size_allocate {
839 my ($self, $w, $h) = @_; 961 my ($self, $w, $h, $changed) = @_;
840 962
841 $self->SUPER::size_allocate ($w, $h); 963 $self->SUPER::size_allocate ($w, $h, $changed);
842 964
843 my $child = $self->{vp}->child; 965 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
845} 967}
846 968
… …
893 1015
894our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
895 1017
896use CFClient::OpenGL; 1018use CFClient::OpenGL;
897 1019
898my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
900 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);
901 1027
902sub new { 1028sub new {
903 my $class = shift; 1029 my $class = shift;
904 1030
905 # TODO: user_x, user_y, overwrite moveto?
906
907 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
910 border => 0.6, 1034 border => 0.6,
911 toplevel => 1,
912 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
913 @_ 1038 @_
914 ); 1039 );
915 1040
916 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
917 align => 0, 1042 align => 0,
… …
936 $h + $self->border * 2, 1061 $h + $self->border * 2,
937 ) 1062 )
938} 1063}
939 1064
940sub size_allocate { 1065sub size_allocate {
941 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
942 1069
943 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
944 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
945 1072
946 $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)
… …
970 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
971 1098
972 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
974 1101
975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
978 $self->check_size;
979 }; 1107 };
980 1108
981 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
982 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
983 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
985 $self->{motion} = sub { 1113 $self->{motion} = sub {
986 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
987 1115
988 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
989 1117
990 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
991 $self->update;
992 }; 1119 };
993 } 1120 }
994} 1121}
995 1122
996sub button_up { 1123sub button_up {
… …
1015 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1016 1143
1017 my $border = $self->border; 1144 my $border = $self->border;
1018 1145
1019 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
1020 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1021 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1022 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1023 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1024 1151
1025 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1026 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
1027 1154
1028 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
1029 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
1030 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
1031
1032 glColor @{ $self->{bg} };
1033
1034 $bg->{s} = $rep_x;
1035 $bg->{t} = $rep_y;
1036 $bg->{wrap_mode} = 1;
1037 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1038 } 1160 }
1039 1161
1040 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1041 1163
… …
1057sub new { 1179sub new {
1058 my $class = shift; 1180 my $class = shift;
1059 1181
1060 $class->SUPER::new ( 1182 $class->SUPER::new (
1061 col_expand => [], 1183 col_expand => [],
1062 @_ 1184 @_,
1063 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1190}
1065 1191
1066sub add { 1192sub add {
1067 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1068 1194
1069 $child->set_parent ($self); 1195 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1071 1197
1072 $child->check_size; 1198 $self->realloc;
1073} 1199}
1074 1200
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1202sub clear {
1081 my ($self) = @_; 1203 my ($self) = @_;
1082 1204
1083 my @children = $self->children; 1205 my @children = $self->children;
1084 delete $self->{children}; 1206 delete $self->{children};
… …
1086 for (@children) { 1208 for (@children) {
1087 delete $_->{parent}; 1209 delete $_->{parent};
1088 $_->hide; 1210 $_->hide;
1089 } 1211 }
1090 1212
1091 $self->update; 1213 $self->realloc;
1092} 1214}
1093 1215
1094sub get_wh { 1216sub get_wh {
1095 my ($self) = @_; 1217 my ($self) = @_;
1096 1218
… …
1123 (sum @$hs), 1245 (sum @$hs),
1124 ) 1246 )
1125} 1247}
1126 1248
1127sub size_allocate { 1249sub size_allocate {
1128 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1129 1251
1130 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1131 1253
1132 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1134 1256
1135 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1314 }
1193} 1315}
1194 1316
1195############################################################################# 1317#############################################################################
1196 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
1197package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1198 1380
1199# TODO: wrap into common Box base class
1200
1201our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1202 1382
1203sub size_request { 1383sub new {
1204 my ($self) = @_; 1384 my $class = shift;
1205 1385
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1207 1387 vertical => 0,
1208 ( 1388 @_,
1209 (List::Util::sum map $_->[0], @alloc),
1210 (List::Util::max map $_->[1], @alloc),
1211 ) 1389 )
1212} 1390}
1213 1391
1214sub size_allocate {
1215 my ($self, $w, $h) = @_;
1216
1217 ($h, $w) = ($w, $h);
1218
1219 my $children = $self->{children};
1220
1221 my @h = map $_->{req_w}, @$children;
1222
1223 my $req_h = List::Util::sum @h;
1224
1225 if ($req_h > $h) {
1226 # ah well, not enough space
1227 $_ *= $h / $req_h for @h;
1228 } else {
1229 my $exp = List::Util::sum map $_->{expand}, @$children;
1230 $exp ||= 1;
1231
1232 for (0 .. $#$children) {
1233 my $child = $children->[$_];
1234
1235 my $alloc_h = $h[$_];
1236 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1237 $h[$_] = $alloc_h;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure ($y, 0, $h, $w);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1392#############################################################################
1256 1393
1257package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1258 1395
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1262 1397
1263sub size_request { 1398sub new {
1264 my ($self) = @_; 1399 my $class = shift;
1265 1400
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1267 1402 vertical => 1,
1268 ( 1403 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1404 )
1272}
1273
1274sub size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1278
1279 my $children = $self->{children};
1280
1281 my @h = map $_->{req_h}, @$children;
1282
1283 my $req_h = List::Util::sum @h;
1284
1285 if ($req_h > $h) {
1286 # ah well, not enough space
1287 $_ *= $h / $req_h for @h;
1288 } else {
1289 my $exp = List::Util::sum map $_->{expand}, @$children;
1290 $exp ||= 1;
1291
1292 for (0 .. $#$children) {
1293 my $child = $children->[$_];
1294
1295 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1296 }
1297 }
1298
1299 CFClient::UI::harmonize \@h;
1300
1301 my $y = 0;
1302 for (0 .. $#$children) {
1303 my $child = $children->[$_];
1304 my $h = $h[$_];
1305 $child->configure (0, $y, $w, $h);
1306
1307 $y += $h;
1308 }
1309
1310 1
1311} 1405}
1312 1406
1313############################################################################# 1407#############################################################################
1314 1408
1315package CFClient::UI::Label; 1409package CFClient::UI::Label;
… …
1332 ellipsise => 3, # end 1426 ellipsise => 3, # end
1333 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1334 fontsize => 1, 1428 fontsize => 1,
1335 align => -1, 1429 align => -1,
1336 valign => -1, 1430 valign => -1,
1337 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1338 can_events => 0, 1433 can_events => 0,
1339 %arg 1434 %arg
1340 ); 1435 );
1341 1436
1342 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1378 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1379 1474
1380 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1381 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1382 1477
1478 $self->realloc;
1383 $self->update; 1479 $self->update;
1384 $self->check_size;
1385} 1480}
1386 1481
1387sub set_markup { 1482sub set_markup {
1388 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1389 1484
… …
1393 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1394 1489
1395 $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;
1396 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1397 1492
1493 $self->realloc;
1398 $self->update; 1494 $self->update;
1399 $self->check_size;
1400} 1495}
1401 1496
1402sub size_request { 1497sub size_request {
1403 my ($self) = @_; 1498 my ($self) = @_;
1404 1499
… …
1418 1513
1419 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1420 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1421 } 1516 }
1422 1517
1423 ( 1518 ($w, $h)
1424 $w + $self->{padding} * 2,
1425 $h + $self->{padding} * 2,
1426 )
1427} 1519}
1428 1520
1429sub size_allocate { 1521sub size_allocate {
1430 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1431 1523
1432 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1433} 1526}
1434 1527
1435sub set_fontsize { 1528sub set_fontsize {
1436 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1437 1530
1438 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1439 delete $self->{texture}; 1532 delete $self->{texture};
1440 1533
1441 $self->update; 1534 $self->realloc;
1442 $self->check_size;
1443} 1535}
1444 1536
1445sub _draw { 1537sub _draw {
1446 my ($self) = @_; 1538 my ($self) = @_;
1447 1539
… …
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1549
1458 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1459 1551
1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1462 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1463 1555
1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1466 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1467 1559
1468 $tex 1560 $tex
1469 }; 1561 };
1470 1562
… …
1519 $self->{text} = $text; 1611 $self->{text} = $text;
1520 1612
1521 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1523 1615
1524 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1525} 1617}
1526 1618
1527sub set_text { 1619sub set_text {
1528 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1529 1621
1530 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1531 $self->_set_text ($text); 1623 $self->_set_text ($text);
1532 $self->update; 1624
1533 $self->check_size; 1625 $self->realloc;
1534} 1626}
1535 1627
1536sub get_text { 1628sub get_text {
1537 $_[0]{text} 1629 $_[0]{text}
1538} 1630}
… …
1541 my ($self) = @_; 1633 my ($self) = @_;
1542 1634
1543 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1544 1636
1545 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1546}
1547
1548sub size_allocate {
1549 my ($self, $w, $h) = @_;
1550
1551 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1552} 1638}
1553 1639
1554sub key_down { 1640sub key_down {
1555 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1556 1642
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1661 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1662 $self->_emit ('escape');
1577 } elsif ($uni) { 1663 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1579 } 1665 }
1580 1666
1581 $self->_set_text ($text); 1667 $self->_set_text ($text);
1582 $self->update; 1668
1583 $self->check_size; 1669 $self->realloc;
1584} 1670}
1585 1671
1586sub focus_in { 1672sub focus_in {
1587 my ($self) = @_; 1673 my ($self) = @_;
1588 1674
… …
1668 if ($sym == 13) { 1754 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1674 $self->update; 1760 $self->update;
1675 1761
1676 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1715 1801
1716sub new { 1802sub new {
1717 my $class = shift; 1803 my $class = shift;
1718 1804
1719 $class->SUPER::new ( 1805 $class->SUPER::new (
1720 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1721 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1722 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1723 can_hover => 1, 1810 can_hover => 1,
1724 align => 0, 1811 align => 0,
1725 valign => 0, 1812 valign => 0,
1726 can_events => 1, 1813 can_events => 1,
1727 @_ 1814 @_
1728 ) 1815 )
1729} 1816}
1730 1817
1818sub activate { }
1819
1731sub button_up { 1820sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1733 1822
1823 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate");
1737 }
1738} 1826}
1739 1827
1740sub _draw { 1828sub _draw {
1741 my ($self) = @_; 1829 my ($self) = @_;
1742 1830
… …
1771 1859
1772sub new { 1860sub new {
1773 my $class = shift; 1861 my $class = shift;
1774 1862
1775 $class->SUPER::new ( 1863 $class->SUPER::new (
1776 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1777 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1778 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2], 1868 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5], 1869 active_bg => [1, 1, 1, 0.5],
1781 state => 0, 1870 state => 0,
… …
1785} 1874}
1786 1875
1787sub size_request { 1876sub size_request {
1788 my ($self) = @_; 1877 my ($self) = @_;
1789 1878
1790 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1791} 1880}
1792 1881
1793sub button_down { 1882sub button_down {
1794 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1795 1884
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1798 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1800 } 1889 }
1801} 1890}
1802 1891
1803sub _draw { 1892sub _draw {
1804 my ($self) = @_; 1893 my ($self) = @_;
1805 1894
1806 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1807 1896
1808 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1809 1898
1810 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;
1811 1902
1812 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1813 1904
1814 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1815 1906
… …
2080 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2081 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2], 2173 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5], 2174 active_bg => [1, 1, 1, 0.5],
2084 range => [0, 0, 100, 10, 0], 2175 range => [0, 0, 100, 10, 0],
2085 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2086 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2087 vertical => 0, 2178 vertical => 0,
2088 can_hover => 1, 2179 can_hover => 1,
2089 inner_pad => 0.02, 2180 inner_pad => 0.02,
2090 @_ 2181 @_
2091 ); 2182 );
… …
2094 $self->update; 2185 $self->update;
2095 2186
2096 $self 2187 $self
2097} 2188}
2098 2189
2190sub changed { }
2191
2099sub set_range { 2192sub set_range {
2100 my ($self, $range) = @_; 2193 my ($self, $range) = @_;
2101 2194
2102 $self->{range} = $range; 2195 ($range, $self->{range}) = ($self->{range}, $range);
2103 2196
2104 $self->update; 2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2105} 2199}
2106 2200
2107sub set_value { 2201sub set_value {
2108 my ($self, $value) = @_; 2202 my ($self, $value) = @_;
2109 2203
… …
2120 if $unit; 2214 if $unit;
2121 2215
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2217
2124 if ($value != $old_value) { 2218 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2219 $self->_emit (changed => $value);
2126 $self->update; 2220 $self->update;
2127 } 2221 }
2128} 2222}
2129 2223
2130sub size_request { 2224sub size_request {
2131 my ($self) = @_; 2225 my ($self) = @_;
2132 2226
2133 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2134 my $h = $self->{req_h};
2135
2136 $self->{vertical} ? ($h, $w) : ($w, $h)
2137} 2228}
2138 2229
2139sub button_down { 2230sub button_down {
2140 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2141 2232
… …
2291 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2292 $self->reflow; 2383 $self->reflow;
2293} 2384}
2294 2385
2295sub size_allocate { 2386sub size_allocate {
2296 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2297 2388
2298 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2299 2392
2300 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2301 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2302 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2303 2396
… …
2492 2585
2493sub new { 2586sub new {
2494 my $class = shift; 2587 my $class = shift;
2495 2588
2496 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2497 state => 0, 2590 state => 0,
2498 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2499 @_ 2592 @_
2500 ); 2593 );
2501 2594
2502 if ($self->{state}) {
2503 $self->{state} = 0;
2504 $self->toggle_flopper;
2505 }
2506
2507 $self 2595 $self
2508} 2596}
2509 2597
2510sub toggle_flopper { 2598sub toggle_flopper {
2511 my ($self) = @_; 2599 my ($self) = @_;
2512 2600
2513 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2514 if ($self->{state} = !$self->{state}) {
2515 $CFClient::UI::ROOT->add ($self->{other});
2516 $self->{other}->move ($self->coord2global (0, $self->{h}));
2517 $self->emit ("open");
2518 } else {
2519 $CFClient::UI::ROOT->remove ($self->{other});
2520 $self->emit ("close");
2521 }
2522
2523 $self->emit (changed => $self->{state});
2524} 2602}
2525 2603
2526############################################################################# 2604#############################################################################
2527 2605
2528package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2560 2638
2561 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2562} 2640}
2563 2641
2564sub size_allocate { 2642sub size_allocate {
2565 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2566 2644
2645 return unless $changed;
2646
2567 $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 });
2568} 2666}
2569 2667
2570sub _draw { 2668sub _draw {
2571 my ($self) = @_; 2669 my ($self) = @_;
2572 2670
… …
2589 glVertex $w, $h; 2687 glVertex $w, $h;
2590 glVertex $w, 0; 2688 glVertex $w, 0;
2591 glEnd; 2689 glEnd;
2592 2690
2593 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2594 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2595} 2694}
2596 2695
2597############################################################################# 2696#############################################################################
2598 2697
… …
2604 2703
2605sub new { 2704sub new {
2606 my $class = shift; 2705 my $class = shift;
2607 2706
2608 my $self = $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2609 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2610 @_, 2710 @_,
2611 ); 2711 );
2612 2712
2613 if ($self->{anim} && $self->{animspeed}) { 2713 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2714 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2773 $self->SUPER::DESTROY;
2674} 2774}
2675 2775
2676############################################################################# 2776#############################################################################
2677 2777
2678package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2679 2779
2680our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2707 2781
2708sub new { 2782sub new {
2709 my $class = shift; 2783 my $class = shift;
2710 2784
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2717 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2718 can_hover => 1,
2719 can_events => 1,
2720 tooltip => ((CFClient::UI::Label::escape $desc)
2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2722 connect_button_down => sub {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2736 } elsif ($ev->{button} == 2) {
2737 $::CONN->send ("apply $item->{tag}");
2738 } elsif ($ev->{button} == 3) {
2739 my @menu_items = (
2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2752 ),
2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2756 }
2757
2758 1
2759 },
2760 %args
2761 );
2762
2763
2764 $self->add (new CFClient::UI::Face
2765 can_events => 0,
2766 face => $item->{face},
2767 anim => $item->{anim},
2768 animspeed => $item->{animspeed},
2769 );
2770
2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2772
2773 $self->{item} = $item;
2774
2775 $self->update_item;
2776
2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2786}
2787
2788#############################################################################
2789
2790package CFClient::UI::Inventory;
2791
2792our @ISA = CFClient::UI::ScrolledWindow::;
2793
2794sub new {
2795 my $class = shift;
2796
2797 my $self = $class->SUPER::new (
2798 scrolled => (new CFClient::UI::Table), 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2799 @_, 2787 @_,
2800 ); 2788 );
2801 2789
2802 $self 2790 $self
2803} 2791}
… …
2813 or ($a->{name} cmp $b->{name}) 2801 or ($a->{name} cmp $b->{name})
2814 } @$items; 2802 } @$items;
2815 2803
2816 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2817 2805
2806 my $row = 0;
2818 for my $item (@items) { 2807 for my $item (@items) {
2819 $item->{item} = $item; 2808 CFClient::Item::update_widgets $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823 2809
2824 my $i = 0; 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2825 for (@items) { 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2826 $self->{scrolled}->add (0, $i, $_); 2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2830 2813
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2814 $row++;
2832} 2815 }
2833
2834sub size_request {
2835 my ($self) = @_;
2836 ($self->{req_w}, $self->{req_h});
2837} 2816}
2838 2817
2839############################################################################# 2818#############################################################################
2840 2819
2841package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2876 2855
2877# 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)
2878sub popup { 2857sub popup {
2879 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2880 2859
2881 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2882 2861
2883 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2863 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2886 2865
2887 $self->show; 2866 $self->show;
2888 $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);
2889} 2868}
2890 2869
2891sub mouse_motion { 2870sub mouse_motion {
2892 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2893 2872
… …
2901 2880
2902 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2882 undef $GRAB;
2904 $self->hide; 2883 $self->hide;
2905 2884
2906 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2908 } 2887 }
2909} 2888}
2910 2889
2911############################################################################# 2890#############################################################################
… …
2973sub add { 2952sub add {
2974 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2975 2954
2976 $text =~ s/^\s+//; 2955 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2978 2959
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 2961
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 2963
… …
3025use CFClient::OpenGL; 3006use CFClient::OpenGL;
3026 3007
3027sub new { 3008sub new {
3028 my $class = shift; 3009 my $class = shift;
3029 3010
3030 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
3031 @_, 3013 @_,
3032 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
3033} 3019}
3034 3020
3035sub configure { 3021sub configure {
3036 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
3037 3023
3038 $self->{w} = $w; 3024 $self->{w} = $w;
3039 $self->{h} = $h; 3025 $self->{h} = $h;
3040} 3026}
3041 3027
3042sub check_size { 3028sub reconfigure {
3043 my ($self) = @_; 3029 my ($self) = @_;
3044 3030
3031 $self->SUPER::reconfigure;
3032
3045 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3046 if $self->{w}; 3034 if $self->{w};
3047} 3035}
3048 3036
3049sub size_request { 3037sub size_request {
3050 my ($self) = @_; 3038 my ($self) = @_;
3051 3039
3052 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
3053} 3041}
3054 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
3055sub size_allocate { 3057sub size_allocate {
3056 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
3057
3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3060
3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3063 3059
3064 for my $child ($self->children) { 3060 for my $child ($self->children) {
3065 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)};
3066 3062
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
3068 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3069 3065
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
3071 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
3072
3073 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3074 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3075 3068
3076 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
3077 } 3070 }
3078} 3071}
3079 3072
… …
3090} 3083}
3091 3084
3092sub update { 3085sub update {
3093 my ($self) = @_; 3086 my ($self) = @_;
3094 3087
3095 $self->check_size;
3096 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
3097} 3089}
3098 3090
3099sub add { 3091sub add {
3100 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3101 3093
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3108 for my $child (@children) {
3109 $child->{toplevel} = 1; 3094 $_->{is_toplevel} = 1
3110 3095 for @children;
3111 # integerise window positions
3112 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y};
3114 }
3115 3096
3116 $self->SUPER::add (@children); 3097 $self->SUPER::add (@children);
3117} 3098}
3118 3099
3119sub remove { 3100sub remove {
3120 my ($self, @children) = @_; 3101 my ($self, @children) = @_;
3121 3102
3122 $self->SUPER::remove (@children); 3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3123 3107
3124 while (@children) { 3108 while (@children) {
3125 my $w = pop @children; 3109 my $w = pop @children;
3126 push @children, $w->children; 3110 push @children, $w->children;
3127 delete $w->{visible}; 3111 $w->set_invisible;
3128 } 3112 }
3129} 3113}
3130 3114
3131sub on_refresh { 3115sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
… …
3146 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
3147 $_->() 3131 $_->()
3148 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
3149 } 3133 }
3150 3134
3151 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
3152 my @queue = ([], []); 3136 my @queue;
3153 3137
3154 for (;;) { 3138 while () {
3155 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
3156 # heuristic: check containers last 3140 #TODO use array-of-depth approach
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
3158 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3159 } 3144 }
3160 3145
3161 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
3162 3147
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
3164 ? @$widget{qw(user_w user_h)} 3149
3165 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
3166 3151
3167 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3168 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3169 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
3170 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3171 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
3172 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
3173 3160
3174 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3175 3162
3176 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
3177 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3178 }
3179 } 3165 }
3180 } 3166 }
3181 3167
3182 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
3183 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3184 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;
3185 3177
3186 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
3188 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3189 $widget->{w} = $w; 3186 $widget->{w} = $w;
3190 $widget->{h} = $h; 3187 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h); 3188
3192 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
3193 } 3190 }
3194 } 3191 }
3195 3192
3196 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
3197 $_->() 3194 $_->()

Diff Legend

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