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.219 by root, Sun May 21 00:34:59 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) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
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}; 182 $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}; 183 $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}; 184 $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}; 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
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 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 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 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};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
281} 376}
282 377
283sub set_max_size { 378sub set_max_size {
284 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 383}
289 384
290sub set_tooltip { 385sub set_tooltip {
291 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
292 392
293 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
294 394
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 418 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
320 420
321 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
322 422
323 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
324 424
325 $focus->update if $focus; 425 $focus->update if $focus;
326 $FOCUS->update; 426 $FOCUS->update;
327} 427}
328 428
… …
331 431
332 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
333 433
334 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
335 435
336 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
337 437
338 $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;
339} 442}
340 443
341sub mouse_motion { } 444sub mouse_motion { }
342sub button_up { } 445sub button_up { }
343sub key_down { } 446sub key_down { }
344sub key_up { } 447sub key_up { }
345 448
346sub button_down { 449sub button_down {
347 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
348 451
349 $self->focus_in; 452 $self->focus_in;
… …
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356sub 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}
357 530
358sub draw { 531sub draw {
359 my ($self) = @_; 532 my ($self) = @_;
360 533
361 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
378 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
379 glEnd; 552 glEnd;
380 glDisable GL_BLEND; 553 glDisable GL_BLEND;
381 } 554 }
382 555
383 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 557 glPushMatrix;
385 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 561 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
392 glEnd; 565 glEnd;
393 glPopMatrix; 566 glPopMatrix;
394 #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;
395 } 568 }
396} 569}
397 570
398sub _draw { 571sub _draw {
399 my ($self) = @_; 572 my ($self) = @_;
400 573
401 warn "no draw defined for $self\n"; 574 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} 575}
451 576
452sub DESTROY { 577sub DESTROY {
453 my ($self) = @_; 578 my ($self) = @_;
454 579
… …
512 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
514} 639}
515 640
516sub size_request { 641sub size_request {
517 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
518} 645}
519 646
520sub draw { } 647sub draw { }
521 648
522############################################################################# 649#############################################################################
… …
551 $self->{children} = [ 678 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
554 ]; 681 ];
555 682
556 $self->check_size (1); 683 $self->realloc;
557 $self->update;
558} 684}
559 685
560sub children { 686sub children {
561 @{ $_[0]{children} } 687 @{ $_[0]{children} }
562} 688}
… …
567 delete $child->{parent}; 693 delete $child->{parent};
568 $child->hide; 694 $child->hide;
569 695
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 697
572 $self->check_size; 698 $self->realloc;
573 $self->update;
574} 699}
575 700
576sub clear { 701sub clear {
577 my ($self) = @_; 702 my ($self) = @_;
578 703
… …
582 for (@$children) { 707 for (@$children) {
583 delete $_->{parent}; 708 delete $_->{parent};
584 $_->hide; 709 $_->hide;
585 } 710 }
586 711
587 $self->check_size; 712 $self->realloc;
588 $self->update;
589} 713}
590 714
591sub find_widget { 715sub find_widget {
592 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
593 717
… …
717 841
718package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
719 843
720our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
721 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
722sub size_request { 856sub size_request {
723 my ($self) = @_; 857 my ($self) = @_;
724 858
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 860
728 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
729} 865}
730 866
731sub size_allocate { 867sub size_allocate {
732 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 876 $self->update;
735} 877}
736 878
737sub set_offset { 879sub set_offset {
738 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
789 my $class = shift; 931 my $class = shift;
790 932
791 my $self; 933 my $self;
792 934
793 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
794 vertical => 1, 936 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 938 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
798 }, 940 },
799 ; 941 ;
800 942
801 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1), 944 vp => (new CFClient::UI::ViewPort expand => 1),
… …
807 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 950 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
810 952
811 $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]);
812} 973}
813 974
814#TODO# update range on size_allocate depending on child 975#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 976# update viewport offset on scroll
816 977
… …
860 1021
861our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
862 1023
863use CFClient::OpenGL; 1024use CFClient::OpenGL;
864 1025
865my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 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); 1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1033
869sub new { 1034sub new {
870 my $class = shift; 1035 my $class = shift;
871 1036
872 # TODO: user_x, user_y, overwrite moveto?
873
874 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1040 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
880 @_ 1044 @_
881 ); 1045 );
882 1046
883 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 1048 align => 0,
… …
937 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
938 1102
939 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
941 1105
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1111 };
947 1112
948 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1117 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
954 1119
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
956 1121
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1123 };
960 } 1124 }
961} 1125}
962 1126
963sub button_up { 1127sub button_up {
… …
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1147
984 my $border = $self->border; 1148 my $border = $self->border;
985 1149
986 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1155
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
994 1158
995 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1162 $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); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1164 }
1006 1165
1007 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
1008 1167
… …
1024sub new { 1183sub new {
1025 my $class = shift; 1184 my $class = shift;
1026 1185
1027 $class->SUPER::new ( 1186 $class->SUPER::new (
1028 col_expand => [], 1187 col_expand => [],
1029 @_ 1188 @_,
1030 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1194}
1032 1195
1033sub add { 1196sub add {
1034 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1035 1198
1036 $child->set_parent ($self); 1199 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1038 1201
1039 $child->check_size; 1202 $self->realloc;
1040} 1203}
1041 1204
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1206sub clear {
1048 my ($self) = @_; 1207 my ($self) = @_;
1049 1208
1050 my @children = $self->children; 1209 my @children = $self->children;
1051 delete $self->{children}; 1210 delete $self->{children};
… …
1053 for (@children) { 1212 for (@children) {
1054 delete $_->{parent}; 1213 delete $_->{parent};
1055 $_->hide; 1214 $_->hide;
1056 } 1215 }
1057 1216
1058 $self->update; 1217 $self->realloc;
1059} 1218}
1060 1219
1061sub get_wh { 1220sub get_wh {
1062 my ($self) = @_; 1221 my ($self) = @_;
1063 1222
… …
1094sub size_allocate { 1253sub size_allocate {
1095 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1096 1255
1097 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1098 1257
1099 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1101 1260
1102 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1318 }
1160} 1319}
1161 1320
1162############################################################################# 1321#############################################################################
1163 1322
1164package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1324
1168our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1169 1326
1170sub size_request { 1327sub size_request {
1171 my ($self) = @_; 1328 my ($self) = @_;
1172 1329
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1174 1331 ? (
1175 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1334 )
1178 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1179} 1339}
1180 1340
1181sub size_allocate { 1341sub size_allocate {
1182 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1183 1343
1184 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1345 my $children = $self->{children};
1187 1346
1188 my @h = map $_->{req_w}, @$children; 1347 my @req;
1189 1348
1190 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1191 1350 @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 { 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 {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1364 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 } 1365 }
1206 } 1366 }
1207 1367
1208 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1209 1369
1210 my $y = 0; 1370 my $pos = 0;
1211 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1374
1216 $y += $h; 1375 $pos += $alloc;
1217 } 1376 }
1218 1377
1219 1 1378 1
1220} 1379}
1221 1380
1222############################################################################# 1381#############################################################################
1223 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
1224package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1225 1399
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1229 1401
1230sub size_request { 1402sub new {
1231 my ($self) = @_; 1403 my $class = shift;
1232 1404
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1234 1406 vertical => 1,
1235 ( 1407 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1408 )
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} 1409}
1279 1410
1280############################################################################# 1411#############################################################################
1281 1412
1282package CFClient::UI::Label; 1413package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1430 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1301 fontsize => 1, 1432 fontsize => 1,
1302 align => -1, 1433 align => -1,
1303 valign => -1, 1434 valign => -1,
1304 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1305 can_events => 0, 1437 can_events => 0,
1306 %arg 1438 %arg
1307 ); 1439 );
1308 1440
1309 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1346 1478
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1349 1481
1482 $self->realloc;
1350 $self->update; 1483 $self->update;
1351 $self->check_size;
1352} 1484}
1353 1485
1354sub set_markup { 1486sub set_markup {
1355 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1356 1488
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1493
1362 $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;
1363 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1364 1496
1497 $self->realloc;
1365 $self->update; 1498 $self->update;
1366 $self->check_size;
1367} 1499}
1368 1500
1369sub size_request { 1501sub size_request {
1370 my ($self) = @_; 1502 my ($self) = @_;
1371 1503
… …
1385 1517
1386 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1388 } 1520 }
1389 1521
1390 ( 1522 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1523}
1395 1524
1396sub size_allocate { 1525sub size_allocate {
1397 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1398 1527
1399 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1530}
1401 1531
1402sub set_fontsize { 1532sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1404 1534
1405 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1536 delete $self->{texture};
1407 1537
1408 $self->update; 1538 $self->realloc;
1409 $self->check_size;
1410} 1539}
1411 1540
1412sub _draw { 1541sub _draw {
1413 my ($self) = @_; 1542 my ($self) = @_;
1414 1543
… …
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1553
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426 1555
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1558 : ($self->{w} - $tex->{w}) * 0.5);
1430 1559
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1562 : ($self->{h} - $tex->{h}) * 0.5);
1434 1563
1435 $tex 1564 $tex
1436 }; 1565 };
1437 1566
… …
1466 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1467 can_hover => 1, 1596 can_hover => 1,
1468 can_focus => 1, 1597 can_focus => 1,
1469 valign => 0, 1598 valign => 0,
1470 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1471 @_ 1601 @_
1472 ) 1602 )
1473} 1603}
1474 1604
1475sub _set_text { 1605sub _set_text {
… …
1485 $self->{text} = $text; 1615 $self->{text} = $text;
1486 1616
1487 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1489 1619
1490 $self->emit (changed => $self->{text}); 1620 $self->_emit (changed => $self->{text});
1491} 1621}
1492 1622
1493sub set_text { 1623sub set_text {
1494 my ($self, $text) = @_; 1624 my ($self, $text) = @_;
1495 1625
1496 $self->{cursor} = length $text; 1626 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1627 $self->_set_text ($text);
1498 $self->update; 1628
1499 $self->check_size; 1629 $self->realloc;
1500} 1630}
1501 1631
1502sub get_text { 1632sub get_text {
1503 $_[0]{text} 1633 $_[0]{text}
1504} 1634}
… …
1507 my ($self) = @_; 1637 my ($self) = @_;
1508 1638
1509 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1510 1640
1511 ($w + 1, $h) # add 1 for cursor 1641 ($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} 1642}
1519 1643
1520sub key_down { 1644sub key_down {
1521 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1522 1646
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1665 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1666 $self->_emit ('escape');
1543 } elsif ($uni) { 1667 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1669 }
1546 1670
1547 $self->_set_text ($text); 1671 $self->_set_text ($text);
1548 $self->update; 1672
1549 $self->check_size; 1673 $self->realloc;
1550} 1674}
1551 1675
1552sub focus_in { 1676sub focus_in {
1553 my ($self) = @_; 1677 my ($self) = @_;
1554 1678
… …
1634 if ($sym == 13) { 1758 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1640 $self->update; 1764 $self->update;
1641 1765
1642 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1681 1805
1682sub new { 1806sub new {
1683 my $class = shift; 1807 my $class = shift;
1684 1808
1685 $class->SUPER::new ( 1809 $class->SUPER::new (
1686 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1687 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1689 can_hover => 1, 1814 can_hover => 1,
1690 align => 0, 1815 align => 0,
1691 valign => 0, 1816 valign => 0,
1692 can_events => 1, 1817 can_events => 1,
1693 @_ 1818 @_
1694 ) 1819 )
1695} 1820}
1696 1821
1822sub activate { }
1823
1697sub button_up { 1824sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1699 1826
1827 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1830}
1705 1831
1706sub _draw { 1832sub _draw {
1707 my ($self) = @_; 1833 my ($self) = @_;
1708 1834
… …
1737 1863
1738sub new { 1864sub new {
1739 my $class = shift; 1865 my $class = shift;
1740 1866
1741 $class->SUPER::new ( 1867 $class->SUPER::new (
1742 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1743 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1872 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1873 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1874 state => 0,
… …
1751} 1878}
1752 1879
1753sub size_request { 1880sub size_request {
1754 my ($self) = @_; 1881 my ($self) = @_;
1755 1882
1756 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1757} 1884}
1758 1885
1759sub button_down { 1886sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1761 1888
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1766 } 1893 }
1767} 1894}
1768 1895
1769sub _draw { 1896sub _draw {
1770 my ($self) = @_; 1897 my ($self) = @_;
1771 1898
1772 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1773 1900
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1902
1776 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;
1777 1906
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1908
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1910
… …
2045 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2177 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2178 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2053 vertical => 0, 2182 vertical => 0,
2054 can_hover => 1, 2183 can_hover => 1,
2055 inner_pad => 0.02, 2184 inner_pad => 0.02,
2056 @_ 2185 @_
2057 ); 2186 );
… …
2060 $self->update; 2189 $self->update;
2061 2190
2062 $self 2191 $self
2063} 2192}
2064 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
2065sub set_value { 2205sub set_value {
2066 my ($self, $value) = @_; 2206 my ($self, $value) = @_;
2067 2207
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2208 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2209
2070 $hi = $lo + 1 if $hi <= $lo; 2210 $hi = $lo + 1 if $hi <= $lo;
2071 2211
2212 $page = $hi - $lo if $page > $hi - $lo;
2213
2072 $value = $lo if $value < $lo; 2214 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2215 $value = $hi - $page if $value > $hi - $page;
2074 2216
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2217 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2218 if $unit;
2077 2219
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2221
2082 if ($value != $old_value) { 2222 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2223 $self->_emit (changed => $value);
2084 $self->update; 2224 $self->update;
2085 } 2225 }
2086} 2226}
2087 2227
2088sub size_request { 2228sub size_request {
2089 my ($self) = @_; 2229 my ($self) = @_;
2090 2230
2091 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2232}
2096 2233
2097sub button_down { 2234sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2099 2236
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2102} 2242}
2103 2243
2104sub mouse_motion { 2244sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2249
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2251
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2253
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2255 }
2116} 2256}
2117 2257
2118sub update { 2258sub update {
2119 my ($self) = @_; 2259 my ($self) = @_;
2120 2260
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2262 $self->set_value ($self->{range}[0]);
2123 2263
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2125 2266
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2268
2128 $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;
2129 2271
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2272 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2273 $value = $value * $self->{scale} + $self->{offset};
2132 2274
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; 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2276 $self->{knob_w} = $knob_w;
2140 }); 2277 });
2141 2278
2142 $self->SUPER::update; 2279 $self->SUPER::update;
2143} 2280}
2144 2281
… …
2168 # draw handle 2305 # draw handle
2169 $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);
2170 2307
2171 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2351
2174############################################################################# 2352#############################################################################
2175 2353
2176package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2177 2355
… …
2207 2385
2208 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2387 $self->reflow;
2210} 2388}
2211 2389
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 { 2390sub size_allocate {
2232 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2233 2392
2234 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2235 2394
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2398
2240 $self->reflow; 2399 $self->reflow;
2241} 2400}
2242 2401
2402sub text_size {
2403 my ($self, $text, $indent) = @_;
2404
2405 my $layout = $self->{layout};
2406
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2409 $layout->set_markup ($text);
2410
2411 $layout->size
2412}
2413
2414sub reflow {
2415 my ($self) = @_;
2416
2417 $self->{need_reflow}++;
2418 $self->update;
2419}
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
2243sub add_paragraph { 2436sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2245 2438
2246 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2247 2440 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2251 2444
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2446}
2257 2447
2258sub update { 2448sub update {
2259 my ($self) = @_; 2449 my ($self) = @_;
2260 2450
… …
2263 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2264 2454
2265 delete $self->{texture}; 2455 delete $self->{texture};
2266 2456
2267 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2268 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2461 my $height = 0;
2270 2462
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2272 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 }
2273 2478
2274 $self->{height} = $height; 2479 $self->{height} = $height;
2275 2480
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2482
2278 delete $self->{texture}; 2483 delete $self->{texture};
2279 } 2484 }
2280 2485
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2284 2489
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]; 2490 my $top = int $self->{children}[1]{range}[0];
2289 2491
2290 my $y0 = $top; 2492 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2292 2494
2293 my $y = 0; 2495 my $y = 0;
2294 2496
2295 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2296 2498
2297 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2298 2500
2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2504
2299 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2506 my $h = $par->[1];
2301 2507
2302 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2305 2512
2306 my ($W, $H) = $layout->size; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2514
2515 glRasterPos $par->[3], $y - $y0;
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2517 }
2309 2518
2310 $y += $h; 2519 $y += $h;
2311 } 2520 }
2312 2521
2313 glDisable GL_TEXTURE_2D; 2522 glDisable GL_BLEND;
2314 }; 2523 };
2315 }); 2524 });
2316} 2525}
2317 2526
2318sub _draw { 2527sub _draw {
… …
2378 2587
2379sub new { 2588sub new {
2380 my $class = shift; 2589 my $class = shift;
2381 2590
2382 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2383 state => 0, 2592 state => 0,
2384 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2385 @_ 2594 @_
2386 ); 2595 );
2387 2596
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2597 $self
2394} 2598}
2395 2599
2396sub toggle_flopper { 2600sub toggle_flopper {
2397 my ($self) = @_; 2601 my ($self) = @_;
2398 2602
2399 # TODO: use animation 2603 $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} 2604}
2411 2605
2412############################################################################# 2606#############################################################################
2413 2607
2414package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2427} 2621}
2428 2622
2429sub set_tooltip_from { 2623sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2638 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2640 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2652
2450sub size_allocate { 2653sub size_allocate {
2451 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2452 2655
2453 $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 });
2454} 2675}
2455 2676
2456sub _draw { 2677sub _draw {
2457 my ($self) = @_; 2678 my ($self) = @_;
2458 2679
… …
2475 glVertex $w, $h; 2696 glVertex $w, $h;
2476 glVertex $w, 0; 2697 glVertex $w, 0;
2477 glEnd; 2698 glEnd;
2478 2699
2479 glTranslate 2 - 0.375, 2 - 0.375; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2701
2480 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2481} 2703}
2482 2704
2483############################################################################# 2705#############################################################################
2484 2706
… …
2490 2712
2491sub new { 2713sub new {
2492 my $class = shift; 2714 my $class = shift;
2493 2715
2494 my $self = $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2495 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2496 @_, 2719 @_,
2497 ); 2720 );
2498 2721
2499 if ($self->{anim} && $self->{animspeed}) { 2722 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self); 2723 Scalar::Util::weaken (my $widget = $self);
… …
2515 2738
2516sub size_request { 2739sub size_request {
2517 (32, 8) 2740 (32, 8)
2518} 2741}
2519 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2520sub _draw { 2751sub _draw {
2521 my ($self) = @_; 2752 my ($self) = @_;
2522 2753
2523 return unless $::CONN;#d# manage and cache textures differently 2754 return unless $::CONN;
2524 2755
2525 my $face; 2756 my $face;
2526 2757
2527 if ($self->{frame}) { 2758 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2759 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2547 2778
2548 $self->{timer}->cancel 2779 $self->{timer}->cancel
2549 if $self->{timer}; 2780 if $self->{timer};
2550 2781
2551 $self->SUPER::DESTROY; 2782 $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 ". pack "N", $item->{tag}) }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2627 )
2628 ),
2629 );
2630
2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2632 }
2633
2634 1
2635 },
2636 %args
2637 );
2638
2639
2640 $self->add (new CFClient::UI::Face
2641 can_events => 0,
2642 face => $item->{face},
2643 anim => $item->{anim},
2644 animspeed => $item->{animspeed},
2645 );
2646
2647 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2648
2649 $self->{item} = $item;
2650
2651 $self->update_item;
2652
2653 $self
2654}
2655
2656sub update_item {
2657 my ($self) = @_;
2658
2659 my $desc = _item_to_desc ($self->{item});
2660
2661 $self->{name_lbl}->set_text ($desc);
2662}
2663
2664#############################################################################
2665
2666package CFClient::UI::Inventory;
2667
2668our @ISA = CFClient::UI::ScrolledWindow::;
2669
2670sub new {
2671 my $class = shift;
2672
2673 my $self = $class->SUPER::new (
2674 scrolled => (new CFClient::UI::VBox),
2675 @_,
2676 );
2677
2678 $self
2679}
2680
2681sub set_items {
2682 my ($self, $items) = @_;
2683
2684 $self->{scrolled}->clear;
2685 return unless $items;
2686
2687 my @items = sort {
2688 ($a->{type} <=> $b->{type})
2689 or ($a->{name} cmp $b->{name})
2690 } @$items;
2691
2692 $self->{real_items} = \@items;
2693
2694 for my $item (@items) {
2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item ();
2697 }
2698
2699 $self->{scrolled}->add (@items);
2700
2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2702}
2703
2704sub size_request {
2705 my ($self) = @_;
2706 ($self->{req_w}, $self->{req_h});
2707} 2783}
2708 2784
2709############################################################################# 2785#############################################################################
2710 2786
2711package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2746 2822
2747# 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)
2748sub popup { 2824sub popup {
2749 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2750 2826
2751 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2752 2828
2753 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2754 $GRAB = $self; 2830 $GRAB = $self;
2755 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2756 2832
2757 $self->show; 2833 $self->show;
2758 $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);
2759} 2835}
2760 2836
2761sub mouse_motion { 2837sub mouse_motion {
2762 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2763 2839
… …
2771 2847
2772 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2773 undef $GRAB; 2849 undef $GRAB;
2774 $self->hide; 2850 $self->hide;
2775 2851
2776 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2777 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2778 } 2854 }
2779} 2855}
2780 2856
2781############################################################################# 2857#############################################################################
… …
2843sub add { 2919sub add {
2844 my ($self, $text, %arg) = @_; 2920 my ($self, $text, %arg) = @_;
2845 2921
2846 $text =~ s/^\s+//; 2922 $text =~ s/^\s+//;
2847 $text =~ s/\s+$//; 2923 $text =~ s/\s+$//;
2924
2925 return unless $text;
2848 2926
2849 my $timeout = time + ((delete $arg{timeout}) || 60); 2927 my $timeout = time + ((delete $arg{timeout}) || 60);
2850 2928
2851 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2852 2930
… …
2886 $self->SUPER::reconfigure; 2964 $self->SUPER::reconfigure;
2887} 2965}
2888 2966
2889############################################################################# 2967#############################################################################
2890 2968
2891package CFClient::UI::Root; 2969package CFClient::UI::Inventory;
2892 2970
2893our @ISA = CFClient::UI::Container::; 2971our @ISA = CFClient::UI::ScrolledWindow::;
2894
2895use CFClient::OpenGL;
2896 2972
2897sub new { 2973sub new {
2898 my $class = shift; 2974 my $class = shift;
2899 2975
2900 $class->SUPER::new ( 2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2901 @_, 2978 @_,
2902 ) 2979 );
2903}
2904 2980
2905sub 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 {
2906 my ($self, $x, $y, $w, $h) = @_; 3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2907 3130
2908 $self->{w} = $w; 3131 $self->clear_command_list;
2909 $self->{h} = $h; 3132 $self->{recording} = 0;
2910} 3133 $self->{rec_btn}->set_text ("start recording");
2911 3134
2912sub 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 {
2913 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}
2914 3153
2915 $self->size_allocate ($self->{w}, $self->{h}) 3154sub update_binding_widgets {
2916 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
2917} 3277}
2918 3278
2919sub size_request { 3279sub size_request {
2920 my ($self) = @_; 3280 my ($self) = @_;
2921 3281
2922 ($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
2923} 3297}
2924 3298
2925sub size_allocate { 3299sub size_allocate {
2926 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2927 3301
2928 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2929 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2930
2931 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2932 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2933
2934 for my $child ($self->children) { 3302 for my $child ($self->children) {
2935 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)};
2936 3304
2937 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3305 $X = $child->{force_x} if exists $child->{force_x};
2938 if exists $child->{req_x}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
2939 3307
2940 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3308 $X = _to_pixel $X, $W, $self->{w};
2941 if exists $child->{req_y}; 3309 $Y = _to_pixel $Y, $H, $self->{h};
2942
2943 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2944 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2945 3310
2946 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
2947 } 3312 }
2948} 3313}
2949 3314
… …
2960} 3325}
2961 3326
2962sub update { 3327sub update {
2963 my ($self) = @_; 3328 my ($self) = @_;
2964 3329
2965 $self->check_size;
2966 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
2967} 3331}
2968 3332
2969sub add { 3333sub add {
2970 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
2971 3335
2972 for my $child (@children) {
2973 $child->{toplevel} = 1; 3336 $_->{is_toplevel} = 1
2974 3337 for @children;
2975 # integerise window positions
2976 $child->{x} = int $child->{x};
2977 $child->{y} = int $child->{y};
2978 }
2979 3338
2980 $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;
3349
3350 while (@children) {
3351 my $w = pop @children;
3352 push @children, $w->children;
3353 $w->set_invisible;
3354 }
2981} 3355}
2982 3356
2983sub on_refresh { 3357sub on_refresh {
2984 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2985 3359
… …
2998 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2999 $_->() 3373 $_->()
3000 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
3001 } 3375 }
3002 3376
3003 if ($self->{check_size}) { 3377 if ($self->{realloc}) {
3004 my @queue = ([], []); 3378 my %queue;
3379 my @queue;
3380 my $widget;
3005 3381
3006 for (;;) { 3382 outer:
3007 if ($self->{check_size}) { 3383 while () {
3008 # heuristic: check containers last 3384 if (my $realloc = delete $self->{realloc}) {
3009 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3385 for $widget (values %$realloc) {
3010 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 }
3011 } 3392 }
3012 3393
3013 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3394 while () {
3395 @queue or last outer;
3014 3396
3015 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3397 $widget = pop @{ $queue[-1] || [] }
3016 ? @$widget{qw(user_w user_h)} 3398 and last;
3017 : $widget->size_request;
3018
3019 if (delete $widget->{force_alloc}
3020 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3021 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3022 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}) {
3023 $widget->{req_w} = $w; 3415 $widget->{req_w} = $w;
3024 $widget->{req_h} = $h; 3416 $widget->{req_h} = $h;
3025 3417
3026 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3418 $self->{size_alloc}{$widget+0} = $widget;
3027 3419
3028 $widget->{parent}->check_size
3029 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 }
3030 } 3427 }
3428
3429 delete $self->{realloc}{$widget+0};
3031 } 3430 }
3032 } 3431 }
3033 3432
3034 while ($self->{size_alloc}) { 3433 while (my $size_alloc = delete $self->{size_alloc}) {
3035 for (values %{delete $self->{size_alloc}}) { 3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
3036 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)};
3037 3441
3038 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
3039 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
3040 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
3041 $widget->{w} = $w; 3452 $widget->{w} = $w;
3042 $widget->{h} = $h; 3453 $widget->{h} = $h;
3043 $widget->size_allocate ($w, $h); 3454
3044 $widget->emit (size_allocate => $w, $h); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
3045 } 3457 }
3046 } 3458 }
3047 3459
3048 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
3049 $_->() 3461 $_->()
3050 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
3051 } 3463 }
3464
3052 3465
3053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3055 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
3056 3469

Diff Legend

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