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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

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

Diff Legend

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