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.217 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

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

Diff Legend

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