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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 60 }
44 61
45 return; 62 return;
46 } 63 }
47 } 64 }
… …
51 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
52} 69}
53 70
54# class methods for events 71# class methods for events
55sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 74 if $FOCUS;
58} 75}
59 76
60sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 79 if $FOCUS;
63} 80}
64 81
65sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
66 my ($ev) = @_; 83 my ($ev) = @_;
… …
75 check_tooltip; 92 check_tooltip;
76 } 93 }
77 94
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 96
80 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 99}
85 100
86sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
87 my ($ev) = @_; 102 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
89 104
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 106
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 108
94 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 111
99 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 114 $grab->update if $grab;
102 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 132
120 check_tooltip; 133 check_tooltip;
121 } 134 }
122 135
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 137 if $HOVER;
127} 138}
128 139
129# convert position array to integers 140# convert position array to integers
130sub harmonize { 141sub harmonize {
131 my ($vals) = @_; 142 my ($vals) = @_;
… …
137 $rem += $_ - $i; 148 $rem += $_ - $i;
138 $_ = $i; 149 $_ = $i;
139 } 150 }
140} 151}
141 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
142# call when resolution changes etc. 169# call when resolution changes etc.
143sub rescale_widgets { 170sub rescale_widgets {
144 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
145 172
146 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
147 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
148 $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.]+$/;
149 $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};
150 $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};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $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.]+$/;
153 $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};
154 $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};
155 $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
156 } 188 }
157
158 $widget->reconfigure;
159 } 189 }
190
191 reconfigure_widgets;
160} 192}
161 193
162############################################################################# 194#############################################################################
163 195
164package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
169 201
170sub new { 202sub new {
171 my $class = shift; 203 my $class = shift;
172 204
173 my $self = bless { 205 my $self = bless {
174 x => 0, 206 x => "center",
175 y => 0, 207 y => "center",
176 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
177 can_events => 1, 211 can_events => 1,
178 @_ 212 @_
179 }, $class; 213 }, $class;
180 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
181 for (keys %$self) { 217 for (keys %$self) {
182 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
184 } 220 }
185 } 221 }
186 222
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
188 234
189 $self 235 $self
190} 236}
191 237
192sub destroy { 238sub destroy {
… …
199sub show { 245sub show {
200 my ($self) = @_; 246 my ($self) = @_;
201 247
202 return if $self->{parent}; 248 return if $self->{parent};
203 249
204 $self->{toplevel} = 1;
205 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
206} 251}
207 252
208sub hide { 253sub set_visible {
209 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};
210 277
211 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
212 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
213 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
214 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
215 if $self->{parent}; 312 if $self->{parent};
216} 313}
217 314
218sub move { 315sub move_abs {
219 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
220 317
221 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
222 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
223 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
224 321
225 $self->update; 322 $self->update;
226} 323}
227 324
228sub set_size { 325sub set_size {
229 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
230 327
231 $self->{user_w} = $w; 328 $self->{force_w} = $w;
232 $self->{user_h} = $h; 329 $self->{force_h} = $h;
233 330
234 $self->check_size; 331 $self->realloc;
235} 332}
236 333
237sub size_request { 334sub size_request {
238 require Carp; 335 require Carp;
239 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
241 338
242sub configure { 339sub configure {
243 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
244 341
245 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
246 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
247 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
248 347
249 # use alignment to adjust x, y 348 # use alignment to adjust x, y
250 349
251 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
252 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
253
254 ($w, $h) = ($w2, $h2);
255 } 352 }
256 353
257 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
258 $self->{x} = $x; 355 $self->{x} = $x;
259 $self->{y} = $y; 356 $self->{y} = $y;
260 $self->update; 357 $self->update;
261 } 358 }
262 359
263 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
264 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
265 } 364 }
266} 365}
267 366
268sub size_allocate { 367sub size_allocate {
269 # nothing to be done 368 # nothing to be done
270} 369}
271 370
272sub reconfigure {
273 my ($self) = @_;
274
275 $self->check_size (1);
276 $self->update;
277}
278
279sub children { 371sub children {
280} 372}
281 373
282sub set_max_size { 374sub set_max_size {
283 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
284 376
285 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
286 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
379}
380
381sub set_tooltip {
382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
287} 395}
288 396
289# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
290sub coord2local { 398sub coord2local {
291 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
… …
306 return if $FOCUS == $self; 414 return if $FOCUS == $self;
307 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
308 416
309 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
310 418
311 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
312 420
313 $focus->update if $focus; 421 $focus->update if $focus;
314 $FOCUS->update; 422 $FOCUS->update;
315} 423}
316 424
… …
319 427
320 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
321 429
322 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
323 431
324 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
325 433
326 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
327} 438}
328 439
329sub mouse_motion { } 440sub mouse_motion { }
330sub button_up { } 441sub button_up { }
331sub key_down { } 442sub key_down { }
332sub key_up { } 443sub key_up { }
333 444
334sub button_down { 445sub button_down {
335 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
336 447
337 $self->focus_in; 448 $self->focus_in;
… …
340sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
341sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
342sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
343sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
344sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
345 525
346sub draw { 526sub draw {
347 my ($self) = @_; 527 my ($self) = @_;
348 528
349 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
366 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
367 glEnd; 547 glEnd;
368 glDisable GL_BLEND; 548 glDisable GL_BLEND;
369 } 549 }
370 550
371 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
372 glPushMatrix; 552 glPushMatrix;
373 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
374 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
375 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
376 glVertex 0 , 0; 556 glVertex 0 , 0;
377 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
378 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
379 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
380 glEnd; 560 glEnd;
381 glPopMatrix; 561 glPopMatrix;
382 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
383 } 563 }
384} 564}
385 565
386sub _draw { 566sub _draw {
387 my ($self) = @_; 567 my ($self) = @_;
388 568
389 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
390}
391
392sub find_widget {
393 my ($self, $x, $y) = @_;
394
395 return () unless $self->{can_events};
396
397 return $self
398 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
399 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
400
401 ()
402}
403
404sub set_parent {
405 my ($self, $parent) = @_;
406
407 Scalar::Util::weaken ($self->{parent} = $parent);
408
409 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size
411 unless exists $self->{req_w};
412}
413
414sub check_size {
415 my ($self, $forced) = @_;
416
417 $self->{force_alloc} = 1 if $forced;
418 $CFClient::UI::ROOT->{check_size}{$self} = $self;
419}
420
421sub update {
422 my ($self) = @_;
423
424 $self->{parent}->update
425 if $self->{parent};
426}
427
428sub connect {
429 my ($self, $signal, $cb) = @_;
430
431 push @{ $self->{signal_cb}{$signal} }, $cb;
432}
433
434sub emit {
435 my ($self, $signal, @args) = @_;
436
437 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
438} 570}
439 571
440sub DESTROY { 572sub DESTROY {
441 my ($self) = @_; 573 my ($self) = @_;
442 574
… …
457 my $class = shift; 589 my $class = shift;
458 590
459 # range [value, low, high, page] 591 # range [value, low, high, page]
460 592
461 $class->SUPER::new ( 593 $class->SUPER::new (
462 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
463 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
464 @_ 596 @_
465 ) 597 )
466} 598}
467 599
468sub _draw { 600sub _draw {
469 my ($self) = @_; 601 my ($self) = @_;
470 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
471 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
472 609
473 glEnable GL_BLEND; 610 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
476 613
477 glBegin GL_QUADS; 614 glBegin GL_QUADS;
478 glVertex 0 , 0; 615 glVertex 0 , 0;
479 glVertex 0 , $h; 616 glVertex 0 , $h;
480 glVertex $w, $h; 617 glVertex $w, $h;
481 glVertex $w, 0; 618 glVertex $w, 0;
482 glEnd; 619 glEnd;
483 620
484 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
485} 623}
486 624
487############################################################################# 625#############################################################################
488 626
489package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
494 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
495 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
496} 634}
497 635
498sub size_request { 636sub size_request {
499 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
500} 640}
501 641
502sub draw { } 642sub draw { }
503 643
504############################################################################# 644#############################################################################
… …
533 $self->{children} = [ 673 $self->{children} = [
534 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
535 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
536 ]; 676 ];
537 677
538 $self->check_size (1); 678 $self->realloc;
539 $self->update;
540} 679}
541 680
542sub children { 681sub children {
543 @{ $_[0]{children} } 682 @{ $_[0]{children} }
544} 683}
… …
549 delete $child->{parent}; 688 delete $child->{parent};
550 $child->hide; 689 $child->hide;
551 690
552 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
553 692
554 $self->check_size; 693 $self->realloc;
555 $self->update;
556} 694}
557 695
558sub clear { 696sub clear {
559 my ($self) = @_; 697 my ($self) = @_;
560 698
… …
564 for (@$children) { 702 for (@$children) {
565 delete $_->{parent}; 703 delete $_->{parent};
566 $_->hide; 704 $_->hide;
567 } 705 }
568 706
569 $self->check_size; 707 $self->realloc;
570 $self->update;
571} 708}
572 709
573sub find_widget { 710sub find_widget {
574 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
575 712
… …
628sub size_request { 765sub size_request {
629 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
630} 767}
631 768
632sub size_allocate { 769sub size_allocate {
633 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
634 771
635 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
636} 773}
637 774
638############################################################################# 775#############################################################################
… …
655 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
656 $self->SUPER::update; 793 $self->SUPER::update;
657} 794}
658 795
659sub size_allocate { 796sub size_allocate {
660 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
661 798
662 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
663 $self->update; 800 $self->update
801 if $changed;
664} 802}
665 803
666sub _render { 804sub _render {
667 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
668} 806}
… …
673 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
674 glClearColor 0, 0, 0, 0; 812 glClearColor 0, 0, 0, 0;
675 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
676 814
677 $self->_render; 815 $self->_render;
678# glColorMask 1, 1, 1, 0;
679# glEnable GL_BLEND;
680# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681# glRasterPos 0, 0;
682# glCopyPixels 0, 0, $self->{w}, $self->{h};
683# glDisable GL_BLEND;
684# glColorMask 1, 1, 1, 1;
685 }; 816 };
686} 817}
687 818
688sub _draw { 819sub _draw {
689 my ($self) = @_; 820 my ($self) = @_;
… …
693 my $tex = $self->{texture} 824 my $tex = $self->{texture}
694 or return; 825 or return;
695 826
696 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698 glColor 0, 0, 0, 1; 829 glColor 1, 1, 1, 1;
699 830
700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701 832
702 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
703} 834}
… …
706 837
707package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
708 839
709our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
710 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
711sub size_request { 852sub size_request {
712 my ($self) = @_; 853 my ($self) = @_;
713 854
714 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
715 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
716 856
717 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
718} 861}
719 862
720sub size_allocate { 863sub size_allocate {
721 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
722 865
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
869 $self->child->configure (0, 0, $w, $h);
723 $self->update; 870 $self->update;
724} 871}
725 872
726sub set_offset { 873sub set_offset {
727 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
778 my $class = shift; 925 my $class = shift;
779 926
780 my $self; 927 my $self;
781 928
782 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
783 vertical => 1, 930 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub { 932 on_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 933 $self->{vp}->set_offset (0, $_[1]);
787 }, 934 },
788 ; 935 ;
789 936
790 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 938 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 939 slider => $slider,
793 @_, 940 @_,
794 ); 941 );
795 942
796 $self->{vp}->add ($self->{scrolled}); 943 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp}); 944 $self->add ($self->{vp});
798 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
799 946
800 $self 947 $self
948}
949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
801} 967}
802 968
803#TODO# update range on size_allocate depending on child 969#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 970# update viewport offset on scroll
805 971
… …
849 1015
850our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
851 1017
852use CFClient::OpenGL; 1018use CFClient::OpenGL;
853 1019
854my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
855 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
856 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
857 1027
858sub new { 1028sub new {
859 my $class = shift; 1029 my $class = shift;
860 1030
861 # TODO: user_x, user_y, overwrite moveto?
862
863 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
864 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
865 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
866 border => 0.6, 1034 border => 0.6,
867 toplevel => 1,
868 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
869 @_ 1038 @_
870 ); 1039 );
871 1040
872 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
873 align => 0, 1042 align => 0,
… …
892 $h + $self->border * 2, 1061 $h + $self->border * 2,
893 ) 1062 )
894} 1063}
895 1064
896sub size_allocate { 1065sub size_allocate {
897 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
898 1069
899 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
900 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
901 1072
902 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
903 if $self->{title}; 1074 if $self->{title};
904 1075
905 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
906} 1077}
907 1078
… …
926 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
927 1098
928 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
929 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
930 1101
931 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
932 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
933 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
934 $self->check_size;
935 }; 1107 };
936 1108
937 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
938 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
939 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
941 $self->{motion} = sub { 1113 $self->{motion} = sub {
942 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
943 1115
944 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
945 1117
946 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
947 $self->update;
948 }; 1119 };
949 } 1120 }
950} 1121}
951 1122
952sub button_up { 1123sub button_up {
… …
971 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
972 1143
973 my $border = $self->border; 1144 my $border = $self->border;
974 1145
975 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
976 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
977 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
978 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
979 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
980 1151
981 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
982 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
983 1154
984 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
985 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
986 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
987
988 glColor @{ $self->{bg} };
989
990 $bg->{s} = $rep_x;
991 $bg->{t} = $rep_y;
992 $bg->{wrap_mode} = 1;
993 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
994 } 1160 }
995 1161
996 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
997 1163
… …
1013sub new { 1179sub new {
1014 my $class = shift; 1180 my $class = shift;
1015 1181
1016 $class->SUPER::new ( 1182 $class->SUPER::new (
1017 col_expand => [], 1183 col_expand => [],
1018 @_ 1184 @_,
1019 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1020} 1190}
1021 1191
1022sub add { 1192sub add {
1023 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1024 1194
1025 $child->set_parent ($self); 1195 $child->set_parent ($self);
1026 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1027 1197
1028 $child->check_size; 1198 $self->realloc;
1029} 1199}
1030 1200
1031sub children {
1032 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1033}
1034
1035# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1036sub clear { 1202sub clear {
1037 my ($self) = @_; 1203 my ($self) = @_;
1038 1204
1039 my @children = $self->children; 1205 my @children = $self->children;
1040 delete $self->{children}; 1206 delete $self->{children};
… …
1042 for (@children) { 1208 for (@children) {
1043 delete $_->{parent}; 1209 delete $_->{parent};
1044 $_->hide; 1210 $_->hide;
1045 } 1211 }
1046 1212
1047 $self->update; 1213 $self->realloc;
1048} 1214}
1049 1215
1050sub get_wh { 1216sub get_wh {
1051 my ($self) = @_; 1217 my ($self) = @_;
1052 1218
… …
1079 (sum @$hs), 1245 (sum @$hs),
1080 ) 1246 )
1081} 1247}
1082 1248
1083sub size_allocate { 1249sub size_allocate {
1084 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1085 1251
1086 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1087 1253
1088 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1089 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1090 1256
1091 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1092 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1093 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1094 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1148 } 1314 }
1149} 1315}
1150 1316
1151############################################################################# 1317#############################################################################
1152 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
1153package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1154 1380
1155# TODO: wrap into common Box base class
1156
1157our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1158 1382
1159sub size_request { 1383sub new {
1160 my ($self) = @_; 1384 my $class = shift;
1161 1385
1162 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1163 1387 vertical => 0,
1164 ( 1388 @_,
1165 (List::Util::sum map $_->[0], @alloc),
1166 (List::Util::max map $_->[1], @alloc),
1167 ) 1389 )
1168} 1390}
1169 1391
1170sub size_allocate {
1171 my ($self, $w, $h) = @_;
1172
1173 ($h, $w) = ($w, $h);
1174
1175 my $children = $self->{children};
1176
1177 my @h = map $_->{req_w}, @$children;
1178
1179 my $req_h = List::Util::sum @h;
1180
1181 if ($req_h > $h) {
1182 # ah well, not enough space
1183 $_ *= $h / $req_h for @h;
1184 } else {
1185 my $exp = List::Util::sum map $_->{expand}, @$children;
1186 $exp ||= 1;
1187
1188 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190
1191 my $alloc_h = $h[$_];
1192 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1193 $h[$_] = $alloc_h;
1194 }
1195 }
1196
1197 CFClient::UI::harmonize \@h;
1198
1199 my $y = 0;
1200 for (0 .. $#$children) {
1201 my $child = $children->[$_];
1202 my $h = $h[$_];
1203 $child->configure ($y, 0, $h, $w);
1204
1205 $y += $h;
1206 }
1207
1208 1
1209}
1210
1211############################################################################# 1392#############################################################################
1212 1393
1213package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1214 1395
1215# TODO: wrap into common Box base class
1216
1217our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1218 1397
1219sub size_request { 1398sub new {
1220 my ($self) = @_; 1399 my $class = shift;
1221 1400
1222 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1223 1402 vertical => 1,
1224 ( 1403 @_,
1225 (List::Util::max map $_->[0], @alloc),
1226 (List::Util::sum map $_->[1], @alloc),
1227 ) 1404 )
1228} 1405}
1229 1406
1230sub size_allocate {
1231 my ($self, $w, $h) = @_;
1232
1233 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1234
1235 my $children = $self->{children};
1236
1237 my @h = map $_->{req_h}, @$children;
1238
1239 my $req_h = List::Util::sum @h;
1240
1241 if ($req_h > $h) {
1242 # ah well, not enough space
1243 $_ *= $h / $req_h for @h;
1244 } else {
1245 my $exp = List::Util::sum map $_->{expand}, @$children;
1246 $exp ||= 1;
1247
1248 for (0 .. $#$children) {
1249 my $child = $children->[$_];
1250
1251 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1252 }
1253 }
1254
1255 CFClient::UI::harmonize \@h;
1256
1257 my $y = 0;
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260 my $h = $h[$_];
1261 $child->configure (0, $y, $w, $h);
1262
1263 $y += $h;
1264 }
1265
1266 1
1267}
1268
1269############################################################################# 1407#############################################################################
1270 1408
1271package CFClient::UI::Label; 1409package CFClient::UI::Label;
1272 1410
1273our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1274 1412
1275use CFClient::OpenGL; 1413use CFClient::OpenGL;
1276 1414
1277sub new { 1415sub new {
1278 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1279 1417
1280 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1282 #font => default_font 1422 #font => default_font
1283 #text => initial text 1423 #text => initial text
1284 #markup => initial narkup 1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1286 fontsize => 1, 1428 fontsize => 1,
1287 align => -1, 1429 align => -1,
1288 valign => -1, 1430 valign => -1,
1289 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1290 can_events => 0, 1433 can_events => 0,
1291 %arg 1434 %arg
1292 ); 1435 );
1293 1436
1294 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1304 } 1447 }
1305 1448
1306 $self 1449 $self
1307} 1450}
1308 1451
1309sub escape { 1452sub escape($) {
1310 local $_ = $_[1]; 1453 local $_ = $_[0];
1311 1454
1312 s/&/&amp;/g; 1455 s/&/&amp;/g;
1313 s/>/&gt;/g; 1456 s/>/&gt;/g;
1314 s/</&lt;/g; 1457 s/</&lt;/g;
1315 1458
1316 $_[1] 1459 $_
1317} 1460}
1318 1461
1319sub update { 1462sub update {
1320 my ($self) = @_; 1463 my ($self) = @_;
1321 1464
… …
1330 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1331 1474
1332 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1333 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1334 1477
1478 $self->realloc;
1335 $self->update; 1479 $self->update;
1336 $self->check_size;
1337} 1480}
1338 1481
1339sub set_markup { 1482sub set_markup {
1340 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1341 1484
… …
1345 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1346 1489
1347 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1349 1492
1493 $self->realloc;
1350 $self->update; 1494 $self->update;
1351 $self->check_size;
1352} 1495}
1353 1496
1354sub size_request { 1497sub size_request {
1355 my ($self) = @_; 1498 my ($self) = @_;
1356 1499
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $self->{layout}->set_width ($self->{max_w} || -1); 1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 1505
1361 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1362 1507
1363 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1368 1513
1369 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1370 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1371 } 1516 }
1372 1517
1373 ( 1518 ($w, $h)
1374 $w + $self->{padding} * 2,
1375 $h + $self->{padding} * 2,
1376 )
1377} 1519}
1378 1520
1379sub size_allocate { 1521sub size_allocate {
1380 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1381 1523
1382 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1383} 1526}
1384 1527
1385sub set_fontsize { 1528sub set_fontsize {
1386 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1387 1530
1388 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1389 delete $self->{texture}; 1532 delete $self->{texture};
1390 1533
1391 $self->update; 1534 $self->realloc;
1392 $self->check_size;
1393} 1535}
1394 1536
1395sub _draw { 1537sub _draw {
1396 my ($self) = @_; 1538 my ($self) = @_;
1539
1540 $self->SUPER::_draw; # draw background, if applicable
1397 1541
1398 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 1543 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 1549
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405 1551
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1408 : ($self->{w} - $tex->{w}) * 0.5; 1554 : ($self->{w} - $tex->{w}) * 0.5);
1409 1555
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1412 : ($self->{h} - $tex->{h}) * 0.5; 1558 : ($self->{h} - $tex->{h}) * 0.5);
1413 1559
1414 $tex 1560 $tex
1415 }; 1561 };
1416 1562
1417 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
… …
1445 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1446 can_hover => 1, 1592 can_hover => 1,
1447 can_focus => 1, 1593 can_focus => 1,
1448 valign => 0, 1594 valign => 0,
1449 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1450 @_ 1597 @_
1451 ) 1598 )
1452} 1599}
1453 1600
1454sub _set_text { 1601sub _set_text {
… …
1464 $self->{text} = $text; 1611 $self->{text} = $text;
1465 1612
1466 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1467 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1468 1615
1469 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1470} 1617}
1471 1618
1472sub set_text { 1619sub set_text {
1473 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1474 1621
1475 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 1623 $self->_set_text ($text);
1477 $self->check_size; 1624
1478 $self->update; 1625 $self->realloc;
1479} 1626}
1480 1627
1481sub get_text { 1628sub get_text {
1482 $_[0]{text} 1629 $_[0]{text}
1483} 1630}
… …
1486 my ($self) = @_; 1633 my ($self) = @_;
1487 1634
1488 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1489 1636
1490 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1491}
1492
1493sub size_allocate {
1494 my ($self, $w, $h) = @_;
1495
1496 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497} 1638}
1498 1639
1499sub key_down { 1640sub key_down {
1500 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1501 1642
… …
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1520 } elsif ($uni == 27) { 1661 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1662 $self->_emit ('escape');
1522 } elsif ($uni) { 1663 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1665 }
1525 1666
1526 $self->_set_text ($text); 1667 $self->_set_text ($text);
1527 $self->update; 1668
1669 $self->realloc;
1528} 1670}
1529 1671
1530sub focus_in { 1672sub focus_in {
1531 my ($self) = @_; 1673 my ($self) = @_;
1532 1674
… …
1612 if ($sym == 13) { 1754 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1618 $self->update; 1760 $self->update;
1619 1761
1620 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1659 1801
1660sub new { 1802sub new {
1661 my $class = shift; 1803 my $class = shift;
1662 1804
1663 $class->SUPER::new ( 1805 $class->SUPER::new (
1664 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1665 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1668 can_hover => 1, 1810 can_hover => 1,
1669 align => 0, 1811 align => 0,
1670 valign => 0, 1812 valign => 0,
1671 can_events => 1, 1813 can_events => 1,
1672 @_ 1814 @_
1673 ) 1815 )
1674} 1816}
1675 1817
1818sub activate { }
1819
1676sub button_up { 1820sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1678 1822
1823 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1826}
1684 1827
1685sub _draw { 1828sub _draw {
1686 my ($self) = @_; 1829 my ($self) = @_;
1687 1830
… …
1716 1859
1717sub new { 1860sub new {
1718 my $class = shift; 1861 my $class = shift;
1719 1862
1720 $class->SUPER::new ( 1863 $class->SUPER::new (
1721 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1722 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1723 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1724 state => 0, 1870 state => 0,
1725 can_hover => 1, 1871 can_hover => 1,
1726 @_ 1872 @_
1727 ) 1873 )
1728} 1874}
1729 1875
1730sub size_request { 1876sub size_request {
1731 my ($self) = @_; 1877 my ($self) = @_;
1732 1878
1733 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1734} 1880}
1735 1881
1736sub button_down { 1882sub button_down {
1737 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1738 1884
1739 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1740 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1741 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1742 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1743 } 1889 }
1744} 1890}
1745 1891
1746sub _draw { 1892sub _draw {
1747 my ($self) = @_; 1893 my ($self) = @_;
1748 1894
1749 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1750 1896
1751 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1752 1898
1753 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1754 1902
1755 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1756 1904
1757 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1758 1906
… …
2012 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
2013 2161
2014sub new { 2162sub new {
2015 my $class = shift; 2163 my $class = shift;
2016 2164
2017 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
2018 2166
2019 # TODO: 0-width page 2167 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2169 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2024 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
2025 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
2026 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2028 vertical => 0, 2178 vertical => 0,
2029 can_hover => 1, 2179 can_hover => 1,
2030 inner_pad => 5, 2180 inner_pad => 0.02,
2031 @_ 2181 @_
2032 ); 2182 );
2033 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
2034 $self 2187 $self
2035} 2188}
2036 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2201sub set_value {
2202 my ($self, $value) = @_;
2203
2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205
2206 $hi = $lo + 1 if $hi <= $lo;
2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2210 $value = $lo if $value < $lo;
2211 $value = $hi - $page if $value > $hi - $page;
2212
2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2214 if $unit;
2215
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217
2218 if ($value != $old_value) {
2219 $self->_emit (changed => $value);
2220 $self->update;
2221 }
2222}
2223
2037sub size_request { 2224sub size_request {
2038 my ($self) = @_; 2225 my ($self) = @_;
2039 2226
2040 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2041 my $h = $self->{req_h};
2042
2043 $self->{vertical} ? ($h, $w) : ($w, $h)
2044} 2228}
2045 2229
2046sub button_down { 2230sub button_down {
2047 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2048 2232
2049 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
2050 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
2051} 2238}
2052 2239
2053sub mouse_motion { 2240sub mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
2055 2242
2056 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245
2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2251 }
2252}
2253
2254sub update {
2255 my ($self) = @_;
2256
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2258 $self->set_value ($self->{range}[0]);
2259
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2058 2262
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2060 2264
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2063 2267
2064 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
2066 $x = $lo if $x < $lo;
2067 $x = $hi - $page if $x > $hi - $page;
2068 $self->{range}[0] = $x;
2069 2270
2070 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2071 $self->update; 2272 $self->{knob_w} = $knob_w;
2072 } 2273 });
2073}
2074 2274
2075# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
2076# so that the handle doesn't leave the texture. This calculation isn't 100%
2077# correct propably, but it does the job for now
2078sub _calc_inner_pad_px {
2079 my ($self, $w) = @_;
2080 ($w / 100) * $self->{inner_pad} # % to pixels
2081} 2276}
2082 2277
2083sub _draw { 2278sub _draw {
2084 my ($self) = @_; 2279 my ($self) = @_;
2085 2280
2086 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
2087 2282
2088 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
2089 2284
2090 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2092 2287
2288 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2290 }
2098 2291
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2294
2102 my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104 $hi = $value + 1 if $lo == $hi;
2105
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109 $page = int $page * $inner_w / ($hi - $lo);
2110 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112 $w -= $page;
2113 $page &= ~1;
2114 glTranslate $page * 0.5, 0, 0;
2115 $page ||= 2;
2116
2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2297
2123 # draw background 2298 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2300
2126 # draw handle 2301 # draw handle
2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128 2303
2129 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2130} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
2131 2347
2132############################################################################# 2348#############################################################################
2133 2349
2134package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2135 2351
… …
2165 2381
2166 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2167 $self->reflow; 2383 $self->reflow;
2168} 2384}
2169 2385
2170sub text_height {
2171 my ($self, $text) = @_;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176 $layout->set_width ($self->{children}[0]{w});
2177 $layout->set_markup ($text);
2178
2179 ($layout->size)[1]
2180}
2181
2182sub reflow {
2183 my ($self) = @_;
2184
2185 $self->{need_reflow}++;
2186 $self->update;
2187}
2188
2189sub size_allocate { 2386sub size_allocate {
2190 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2191 2388
2192 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2193 2392
2194 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2195 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2196 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2197 2396
2198 $self->reflow; 2397 $self->reflow;
2199} 2398}
2200 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2201sub add_paragraph { 2434sub add_paragraph {
2202 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2203 2436
2204 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2205 2438 my ($w, $h) = $self->text_size ($line);
2206 my $height = $self->text_height ($text);
2207
2208 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2209 2442
2210 push @{$self->{par}}, [$height, $color, $text];
2211
2212 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2213 $self->{children}[1]->update;
2214} 2444}
2215 2445
2216sub update { 2446sub update {
2217 my ($self) = @_; 2447 my ($self) = @_;
2218 2448
… …
2221 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2222 2452
2223 delete $self->{texture}; 2453 delete $self->{texture};
2224 2454
2225 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2226 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2227 my $height = 0; 2459 my $height = 0;
2228 2460
2229 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2230 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2231 2476
2232 $self->{height} = $height; 2477 $self->{height} = $height;
2233 2478
2234 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2235 2480
2236 delete $self->{texture}; 2481 delete $self->{texture};
2237 } 2482 }
2238 2483
2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2240 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2242 2487
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2247 2489
2248 my $y0 = $top; 2490 my $y0 = $top;
2249 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2250 2492
2251 my $y = 0; 2493 my $y = 0;
2252 2494
2253 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2254 2496
2255 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2256 2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2257 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2504 my $h = $par->[1];
2259 2505
2260 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2262 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2263 2510
2264 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2512
2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2515 }
2267 2516
2268 $y += $h; 2517 $y += $h;
2269 } 2518 }
2270 2519
2271 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2272 }; 2521 };
2273 }); 2522 });
2274} 2523}
2275 2524
2276sub _draw { 2525sub _draw {
2277 my ($self) = @_; 2526 my ($self) = @_;
2278 2527
2279 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2283 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2284 2533
2285 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2286 2535
2287} 2536}
… …
2336 2585
2337sub new { 2586sub new {
2338 my $class = shift; 2587 my $class = shift;
2339 2588
2340 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2341 state => 0, 2590 state => 0,
2342 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2343 @_ 2592 @_
2344 ); 2593 );
2345 2594
2346 if ($self->{state}) {
2347 $self->{state} = 0;
2348 $self->toggle_flopper;
2349 }
2350
2351 $self 2595 $self
2352} 2596}
2353 2597
2354sub toggle_flopper { 2598sub toggle_flopper {
2355 my ($self) = @_; 2599 my ($self) = @_;
2356 2600
2357 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2358 if ($self->{state} = !$self->{state}) {
2359 $CFClient::UI::ROOT->add ($self->{other});
2360 $self->{other}->move ($self->coord2global (0, $self->{h}));
2361 $self->emit ("open");
2362 } else {
2363 $CFClient::UI::ROOT->remove ($self->{other});
2364 $self->emit ("close");
2365 }
2366
2367 $self->emit (changed => $self->{state});
2368} 2602}
2369 2603
2370############################################################################# 2604#############################################################################
2371 2605
2372package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2386 2620
2387sub set_tooltip_from { 2621sub set_tooltip_from {
2388 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2389 2623
2390 $self->add (new CFClient::UI::Label 2624 $self->add (new CFClient::UI::Label
2391 markup => $widget->{tooltip}, 2625 markup => $widget->{tooltip},
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 2627 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 2631 );
2397} 2632}
2398 2633
2399sub size_request { 2634sub size_request {
2400 my ($self) = @_; 2635 my ($self) = @_;
… …
2403 2638
2404 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2405} 2640}
2406 2641
2407sub size_allocate { 2642sub size_allocate {
2408 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2409 2644
2645 return unless $changed;
2646
2410 $self->SUPER::size_allocate ($w - 4, $h - 4); 2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2411} 2666}
2412 2667
2413sub _draw { 2668sub _draw {
2414 my ($self) = @_; 2669 my ($self) = @_;
2415 2670
… …
2432 glVertex $w, $h; 2687 glVertex $w, $h;
2433 glVertex $w, 0; 2688 glVertex $w, 0;
2434 glEnd; 2689 glEnd;
2435 2690
2436 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2437 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2438} 2694}
2439 2695
2440############################################################################# 2696#############################################################################
2441 2697
… …
2446use CFClient::OpenGL; 2702use CFClient::OpenGL;
2447 2703
2448sub new { 2704sub new {
2449 my $class = shift; 2705 my $class = shift;
2450 2706
2451 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2452 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2453 @_, 2710 @_,
2454 ) 2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2455} 2728}
2456 2729
2457sub size_request { 2730sub size_request {
2458 (32, 8) 2731 (32, 8)
2459} 2732}
2460 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2461sub _draw { 2742sub _draw {
2462 my ($self) = @_; 2743 my ($self) = @_;
2463 2744
2464 return unless $::CONN;#d# manage and cache textures differently 2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466 2757
2467 # TODO animation
2468 if ($tex) { 2758 if ($tex) {
2469 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2474 } 2764 }
2475} 2765}
2476 2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2477############################################################################# 2776#############################################################################
2478 2777
2479package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2480 2779
2481our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2482 2781
2483sub new { 2782sub new {
2484 my $class = shift; 2783 my $class = shift;
2485 2784
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2496 can_hover => 1, 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_, 2787 @_,
2555 ); 2788 );
2556 2789
2557 $self 2790 $self
2558} 2791}
… …
2568 or ($a->{name} cmp $b->{name}) 2801 or ($a->{name} cmp $b->{name})
2569 } @$items; 2802 } @$items;
2570 2803
2571 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2572 2805
2806 my $row = 0;
2573 for my $item (@items) { 2807 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2 2808 CFClient::Item::update_widgets $item;
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577 2809
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2579 } 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2580 2813
2581 $self->{scrolled}->add (@items); 2814 $row++;
2582 2815 }
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584}
2585
2586sub size_request {
2587 my ($self) = @_;
2588 ($self->{req_w}, $self->{req_h});
2589} 2816}
2590 2817
2591############################################################################# 2818#############################################################################
2592 2819
2593package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2628 2855
2629# popup given the event (must be a mouse button down event currently) 2856# popup given the event (must be a mouse button down event currently)
2630sub popup { 2857sub popup {
2631 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2632 2859
2633 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2634 2861
2635 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2636 $GRAB = $self; 2863 $GRAB = $self;
2637 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2638 2865
2639 $self->show; 2866 $self->show;
2640 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2641} 2868}
2642 2869
2643sub mouse_motion { 2870sub mouse_motion {
2644 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2645 2872
… …
2653 2880
2654 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2655 undef $GRAB; 2882 undef $GRAB;
2656 $self->hide; 2883 $self->hide;
2657 2884
2658 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2659 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2660 } 2887 }
2661} 2888}
2662 2889
2663############################################################################# 2890#############################################################################
2664 2891
2665package CFClient::UI::Statusbox; 2892package CFClient::UI::Statusbox;
2666 2893
2667our @ISA = CFClient::UI::VBox::; 2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2668 2904
2669sub reorder { 2905sub reorder {
2670 my ($self) = @_; 2906 my ($self) = @_;
2671 my $NOW = time; 2907 my $NOW = time;
2672 2908
… …
2691 ? "<b>$item->{count} ×</b> $item->{text}" 2927 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 2928 : $item->{text};
2693 2929
2694 for ($short) { 2930 for ($short) {
2695 s/^\s+//; 2931 s/^\s+//;
2696 s/\012.*/…/s; 2932 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 2933 }
2700 2934
2701 new CFClient::UI::Label 2935 new CFClient::UI::Label
2702 markup => $short, 2936 markup => $short,
2703 tooltip => $item->{tooltip}, 2937 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 2938 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 2939 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2707 color => $item->{color}, 2942 fg => $item->{fg},
2708 can_events => 1, 2943 can_events => 1,
2709 can_hover => 1 2944 can_hover => 1
2710 }; 2945 };
2711 } 2946 }
2712 2947
… …
2717sub add { 2952sub add {
2718 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2719 2954
2720 $text =~ s/^\s+//; 2955 $text =~ s/^\s+//;
2721 $text =~ s/\s+$//; 2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2722 2959
2723 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2724 2961
2725 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726 2963
… …
2738 $self->{item}{$group} = { 2975 $self->{item}{$group} = {
2739 id => ++$self->{id}, 2976 id => ++$self->{id},
2740 text => $text, 2977 text => $text,
2741 timeout => $timeout, 2978 timeout => $timeout,
2742 tooltip => $text, 2979 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 2980 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 2981 pri => 0,
2746 count => 1, 2982 count => 1,
2747 %arg, 2983 %arg,
2748 }; 2984 };
2749 } 2985 }
2750 2986
2751 $self->reorder; 2987 $self->reorder;
2752} 2988}
2753 2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2998}
2999
2754############################################################################# 3000#############################################################################
2755 3001
2756package CFClient::UI::Root; 3002package CFClient::UI::Root;
2757 3003
2758our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
… …
2760use CFClient::OpenGL; 3006use CFClient::OpenGL;
2761 3007
2762sub new { 3008sub new {
2763 my $class = shift; 3009 my $class = shift;
2764 3010
2765 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
2766 @_, 3013 @_,
2767 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
2768} 3019}
2769 3020
2770sub configure { 3021sub configure {
2771 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2772 3023
2773 $self->{w} = $w; 3024 $self->{w} = $w;
2774 $self->{h} = $h; 3025 $self->{h} = $h;
2775} 3026}
2776 3027
2777sub check_size { 3028sub reconfigure {
2778 my ($self) = @_; 3029 my ($self) = @_;
2779 3030
3031 $self->SUPER::reconfigure;
3032
2780 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
2781 if $self->{w}; 3034 if $self->{w};
2782} 3035}
2783 3036
2784sub size_request { 3037sub size_request {
2785 my ($self) = @_; 3038 my ($self) = @_;
2786 3039
2787 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
2788} 3041}
2789 3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
2790sub size_allocate { 3057sub size_allocate {
2791 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
2792
2793 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2794 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2795
2796 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 3059
2799 for my $child ($self->children) { 3060 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 3062
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3065
3066 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h};
3068
2804 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
2805 } 3070 }
2806} 3071}
2807 3072
2808sub coord2local { 3073sub coord2local {
… …
2818} 3083}
2819 3084
2820sub update { 3085sub update {
2821 my ($self) = @_; 3086 my ($self) = @_;
2822 3087
2823 $self->check_size;
2824 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
2825} 3089}
2826 3090
2827sub add { 3091sub add {
2828 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2829 3093
2830 # integerise window positions 3094 $_->{is_toplevel} = 1
2831 $child->{x} = int $child->{x}; 3095 for @children;
2832 $child->{y} = int $child->{y};
2833 3096
2834 $self->SUPER::add ($child); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2835} 3113}
2836 3114
2837sub on_refresh { 3115sub on_refresh {
2838 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2839 3117
… …
2852 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2853 $_->() 3131 $_->()
2854 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
2855 } 3133 }
2856 3134
2857 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
2858 my @queue = ([], []); 3136 my @queue;
2859 3137
2860 for (;;) { 3138 while () {
2861 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
2862 # heuristic: check containers last 3140 #TODO use array-of-depth approach
2863 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
2864 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
2865 } 3144 }
2866 3145
2867 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
2868 3147
2869 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
2870 ? @$widget{qw(user_w user_h)} 3149
2871 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
2872 3151
2873 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
2874 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
2875 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
2876 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
2877 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
2878 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
2879 3160
2880 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2881 3162
2882 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
2883 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2884 }
2885 } 3165 }
2886 } 3166 }
2887 3167
2888 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
2889 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2890 my ($widget, $w, $h) = @$_; 3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
2891 3177
2892 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
2893 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
2894 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
2895 $widget->{w} = $w; 3186 $widget->{w} = $w;
2896 $widget->{h} = $h; 3187 $widget->{h} = $h;
2897 $widget->size_allocate ($w, $h); 3188
2898 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
2899 } 3190 }
2900 } 3191 }
2901 3192
2902 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
2903 $_->() 3194 $_->()
… …
2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2910 3201
2911 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2912 glLoadIdentity; 3203 glLoadIdentity;
2913 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2915 glLoadIdentity; 3206 glLoadIdentity;
2916 3207
2917 $self->_draw; 3208 $self->_draw;
2918} 3209}
… …
2920############################################################################# 3211#############################################################################
2921 3212
2922package CFClient::UI; 3213package CFClient::UI;
2923 3214
2924$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926 3217
29271 32181
2928 3219

Diff Legend

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