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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
50 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
51} 69}
52 70
53# class methods for events 71# class methods for events
54sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 74 if $FOCUS;
57} 75}
58 76
59sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 79 if $FOCUS;
62} 80}
63 81
64sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
… …
74 check_tooltip; 92 check_tooltip;
75 } 93 }
76 94
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 96
79 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 99}
84 100
85sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
86 my ($ev) = @_; 102 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
88 104
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 106
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 108
93 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 111
98 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 114 $grab->update if $grab;
101 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 132
119 check_tooltip; 133 check_tooltip;
120 } 134 }
121 135
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 137 if $HOVER;
126} 138}
127 139
128# convert position array to integers 140# convert position array to integers
129sub harmonize { 141sub harmonize {
130 my ($vals) = @_; 142 my ($vals) = @_;
… …
136 $rem += $_ - $i; 148 $rem += $_ - $i;
137 $_ = $i; 149 $_ = $i;
138 } 150 }
139} 151}
140 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
141# call when resolution changes etc. 169# call when resolution changes etc.
142sub rescale_widgets { 170sub rescale_widgets {
143 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
144 172
145 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $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.]+$/;
152 $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};
153 $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};
154 $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
155 } 188 }
156
157 $widget->reconfigure;
158 } 189 }
190
191 reconfigure_widgets;
159} 192}
160 193
161############################################################################# 194#############################################################################
162 195
163package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
168 201
169sub new { 202sub new {
170 my $class = shift; 203 my $class = shift;
171 204
172 my $self = bless { 205 my $self = bless {
173 x => 0, 206 x => "center",
174 y => 0, 207 y => "center",
175 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
176 can_events => 1, 211 can_events => 1,
177 @_ 212 @_
178 }, $class; 213 }, $class;
179 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
180 for (keys %$self) { 217 for (keys %$self) {
181 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
183 } 220 }
184 } 221 }
185 222
186 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 }
187 234
188 $self 235 $self
189} 236}
190 237
191sub destroy { 238sub destroy {
… …
201 return if $self->{parent}; 248 return if $self->{parent};
202 249
203 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
204} 251}
205 252
206sub hide { 253sub set_visible {
207 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};
208 277
209 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
213 if $self->{parent}; 312 if $self->{parent};
214} 313}
215 314
216sub move { 315sub move_abs {
217 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
218 317
219 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
222 321
223 $self->update; 322 $self->update;
224} 323}
225 324
226sub set_size { 325sub set_size {
227 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
228 327
229 $self->{user_w} = $w; 328 $self->{force_w} = $w;
230 $self->{user_h} = $h; 329 $self->{force_h} = $h;
231 330
232 $self->check_size; 331 $self->realloc;
233} 332}
234 333
235sub size_request { 334sub size_request {
236 require Carp; 335 require Carp;
237 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
239 338
240sub configure { 339sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
242 341
243 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
246 347
247 # use alignment to adjust x, y 348 # use alignment to adjust x, y
248 349
249 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 352 }
254 353
255 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 355 $self->{x} = $x;
257 $self->{y} = $y; 356 $self->{y} = $y;
258 $self->update; 357 $self->update;
259 } 358 }
260 359
261 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
361 return unless $self->{visible};
362
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
263 } 364 }
264} 365}
265 366
266sub size_allocate { 367sub size_allocate {
267 # nothing to be done 368 # nothing to be done
268} 369}
269 370
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 371sub children {
278} 372}
279 373
280sub set_max_size { 374sub set_max_size {
281 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 379}
286 380
287sub set_tooltip { 381sub set_tooltip {
288 my ($self, $tooltip) = @_; 382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
289 388
290 $self->{tooltip} = $tooltip; 389 $self->{tooltip} = $tooltip;
291 390
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 392 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 414 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
317 416
318 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
319 418
320 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
321 420
322 $focus->update if $focus; 421 $focus->update if $focus;
323 $FOCUS->update; 422 $FOCUS->update;
324} 423}
325 424
… …
328 427
329 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
330 429
331 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
332 431
333 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
334 433
335 $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;
336} 438}
337 439
338sub mouse_motion { } 440sub mouse_motion { }
339sub button_up { } 441sub button_up { }
340sub key_down { } 442sub key_down { }
341sub key_up { } 443sub key_up { }
342 444
343sub button_down { 445sub button_down {
344 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
345 447
346 $self->focus_in; 448 $self->focus_in;
… …
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
353sub 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}
354 525
355sub draw { 526sub draw {
356 my ($self) = @_; 527 my ($self) = @_;
357 528
358 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
375 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
376 glEnd; 547 glEnd;
377 glDisable GL_BLEND; 548 glDisable GL_BLEND;
378 } 549 }
379 550
380 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
381 glPushMatrix; 552 glPushMatrix;
382 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 556 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
389 glEnd; 560 glEnd;
390 glPopMatrix; 561 glPopMatrix;
391 #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;
392 } 563 }
393} 564}
394 565
395sub _draw { 566sub _draw {
396 my ($self) = @_; 567 my ($self) = @_;
397 568
398 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 570}
448 571
449sub DESTROY { 572sub DESTROY {
450 my ($self) = @_; 573 my ($self) = @_;
451 574
… …
509 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
511} 634}
512 635
513sub size_request { 636sub size_request {
514 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
515} 640}
516 641
517sub draw { } 642sub draw { }
518 643
519############################################################################# 644#############################################################################
… …
548 $self->{children} = [ 673 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
551 ]; 676 ];
552 677
553 $self->check_size (1); 678 $self->realloc;
554 $self->update;
555} 679}
556 680
557sub children { 681sub children {
558 @{ $_[0]{children} } 682 @{ $_[0]{children} }
559} 683}
… …
564 delete $child->{parent}; 688 delete $child->{parent};
565 $child->hide; 689 $child->hide;
566 690
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 692
569 $self->check_size; 693 $self->realloc;
570 $self->update;
571} 694}
572 695
573sub clear { 696sub clear {
574 my ($self) = @_; 697 my ($self) = @_;
575 698
… …
579 for (@$children) { 702 for (@$children) {
580 delete $_->{parent}; 703 delete $_->{parent};
581 $_->hide; 704 $_->hide;
582 } 705 }
583 706
584 $self->check_size; 707 $self->realloc;
585 $self->update;
586} 708}
587 709
588sub find_widget { 710sub find_widget {
589 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
590 712
… …
643sub size_request { 765sub size_request {
644 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
645} 767}
646 768
647sub size_allocate { 769sub size_allocate {
648 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
649 771
650 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
651} 773}
652 774
653############################################################################# 775#############################################################################
… …
670 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
671 $self->SUPER::update; 793 $self->SUPER::update;
672} 794}
673 795
674sub size_allocate { 796sub size_allocate {
675 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
676 798
677 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
678 $self->update; 800 $self->update
801 if $changed;
679} 802}
680 803
681sub _render { 804sub _render {
682 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
683} 806}
… …
688 $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 {
689 glClearColor 0, 0, 0, 0; 812 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
691 814
692 $self->_render; 815 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 816 };
701} 817}
702 818
703sub _draw { 819sub _draw {
704 my ($self) = @_; 820 my ($self) = @_;
… …
708 my $tex = $self->{texture} 824 my $tex = $self->{texture}
709 or return; 825 or return;
710 826
711 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 829 glColor 1, 1, 1, 1;
714 830
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 832
717 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
718} 834}
… …
721 837
722package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
723 839
724our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
725 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
726sub size_request { 852sub size_request {
727 my ($self) = @_; 853 my ($self) = @_;
728 854
729 @$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)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 856
732 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
733} 861}
734 862
735sub size_allocate { 863sub size_allocate {
736 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
737 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);
738 $self->update; 870 $self->update;
739} 871}
740 872
741sub set_offset { 873sub set_offset {
742 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
793 my $class = shift; 925 my $class = shift;
794 926
795 my $self; 927 my $self;
796 928
797 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
798 vertical => 1, 930 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 932 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 933 $self->{vp}->set_offset (0, $_[1]);
802 }, 934 },
803 ; 935 ;
804 936
805 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 938 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 939 slider => $slider,
808 @_, 940 @_,
809 ); 941 );
810 942
811 $self->{vp}->add ($self->{scrolled}); 943 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 944 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
814 946
815 $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]);
816} 967}
817 968
818#TODO# update range on size_allocate depending on child 969#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 970# update viewport offset on scroll
820 971
… …
864 1015
865our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
866 1017
867use CFClient::OpenGL; 1018use CFClient::OpenGL;
868 1019
869my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 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);
872 1027
873sub new { 1028sub new {
874 my $class = shift; 1029 my $class = shift;
875 1030
876 # TODO: user_x, user_y, overwrite moveto?
877
878 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1034 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
884 @_ 1038 @_
885 ); 1039 );
886 1040
887 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 1042 align => 0,
… …
907 $h + $self->border * 2, 1061 $h + $self->border * 2,
908 ) 1062 )
909} 1063}
910 1064
911sub size_allocate { 1065sub size_allocate {
912 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
913 1069
914 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
916 1072
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
941 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
942 1098
943 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
945 1101
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1107 };
951 1108
952 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1113 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
958 1115
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
960 1117
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1119 };
964 } 1120 }
965} 1121}
966 1122
967sub button_up { 1123sub button_up {
… …
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1143
988 my $border = $self->border; 1144 my $border = $self->border;
989 1145
990 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1151
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
998 1154
999 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1160 }
1010 1161
1011 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1012 1163
… …
1028sub new { 1179sub new {
1029 my $class = shift; 1180 my $class = shift;
1030 1181
1031 $class->SUPER::new ( 1182 $class->SUPER::new (
1032 col_expand => [], 1183 col_expand => [],
1033 @_ 1184 @_,
1034 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1190}
1036 1191
1037sub add { 1192sub add {
1038 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1039 1194
1040 $child->set_parent ($self); 1195 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1042 1197
1043 $child->check_size; 1198 $self->realloc;
1044} 1199}
1045 1200
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# 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?
1051sub clear { 1202sub clear {
1052 my ($self) = @_; 1203 my ($self) = @_;
1053 1204
1054 my @children = $self->children; 1205 my @children = $self->children;
1055 delete $self->{children}; 1206 delete $self->{children};
… …
1057 for (@children) { 1208 for (@children) {
1058 delete $_->{parent}; 1209 delete $_->{parent};
1059 $_->hide; 1210 $_->hide;
1060 } 1211 }
1061 1212
1062 $self->update; 1213 $self->realloc;
1063} 1214}
1064 1215
1065sub get_wh { 1216sub get_wh {
1066 my ($self) = @_; 1217 my ($self) = @_;
1067 1218
… …
1094 (sum @$hs), 1245 (sum @$hs),
1095 ) 1246 )
1096} 1247}
1097 1248
1098sub size_allocate { 1249sub size_allocate {
1099 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1100 1251
1101 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1102 1253
1103 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1105 1256
1106 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1314 }
1164} 1315}
1165 1316
1166############################################################################# 1317#############################################################################
1167 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
1168package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1169 1380
1170# TODO: wrap into common Box base class
1171
1172our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1173 1382
1174sub size_request { 1383sub new {
1175 my ($self) = @_; 1384 my $class = shift;
1176 1385
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1178 1387 vertical => 0,
1179 ( 1388 @_,
1180 (List::Util::sum map $_->[0], @alloc),
1181 (List::Util::max map $_->[1], @alloc),
1182 ) 1389 )
1183} 1390}
1184 1391
1185sub size_allocate {
1186 my ($self, $w, $h) = @_;
1187
1188 ($h, $w) = ($w, $h);
1189
1190 my $children = $self->{children};
1191
1192 my @h = map $_->{req_w}, @$children;
1193
1194 my $req_h = List::Util::sum @h;
1195
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children;
1201 $exp ||= 1;
1202
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 }
1210 }
1211
1212 CFClient::UI::harmonize \@h;
1213
1214 my $y = 0;
1215 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_];
1218 $child->configure ($y, 0, $h, $w);
1219
1220 $y += $h;
1221 }
1222
1223 1
1224}
1225
1226############################################################################# 1392#############################################################################
1227 1393
1228package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1229 1395
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1233 1397
1234sub size_request { 1398sub new {
1235 my ($self) = @_; 1399 my $class = shift;
1236 1400
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1238 1402 vertical => 1,
1239 ( 1403 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1404 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1405}
1283 1406
1284############################################################################# 1407#############################################################################
1285 1408
1286package CFClient::UI::Label; 1409package CFClient::UI::Label;
… …
1297 #bg => none 1420 #bg => none
1298 #active_bg => none 1421 #active_bg => none
1299 #font => default_font 1422 #font => default_font
1300 #text => initial text 1423 #text => initial text
1301 #markup => initial narkup 1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1427 layout => (new CFClient::Layout),
1303 fontsize => 1, 1428 fontsize => 1,
1304 align => -1, 1429 align => -1,
1305 valign => -1, 1430 valign => -1,
1306 padding => 2, 1431 padding_x => 2,
1432 padding_y => 2,
1307 can_events => 0, 1433 can_events => 0,
1308 %arg 1434 %arg
1309 ); 1435 );
1310 1436
1311 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1348 1474
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1351 1477
1478 $self->realloc;
1352 $self->update; 1479 $self->update;
1353 $self->check_size;
1354} 1480}
1355 1481
1356sub set_markup { 1482sub set_markup {
1357 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1358 1484
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1489
1364 $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;
1365 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1366 1492
1493 $self->realloc;
1367 $self->update; 1494 $self->update;
1368 $self->check_size;
1369} 1495}
1370 1496
1371sub size_request { 1497sub size_request {
1372 my ($self) = @_; 1498 my ($self) = @_;
1373 1499
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $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});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1505
1378 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1379 1507
1380 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1385 1513
1386 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1388 } 1516 }
1389 1517
1390 ( 1518 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1519}
1395 1520
1396sub size_allocate { 1521sub size_allocate {
1397 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1398 1523
1399 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1400} 1526}
1401 1527
1402sub set_fontsize { 1528sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1404 1530
1405 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1532 delete $self->{texture};
1407 1533
1408 $self->update; 1534 $self->realloc;
1409 $self->check_size;
1410} 1535}
1411 1536
1412sub _draw { 1537sub _draw {
1413 my ($self) = @_; 1538 my ($self) = @_;
1414 1539
… …
1416 1541
1417 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1543 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $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});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1549
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1551
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1554 : ($self->{w} - $tex->{w}) * 0.5);
1428 1555
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1558 : ($self->{h} - $tex->{h}) * 0.5);
1432 1559
1433 $tex 1560 $tex
1434 }; 1561 };
1435 1562
… …
1464 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1465 can_hover => 1, 1592 can_hover => 1,
1466 can_focus => 1, 1593 can_focus => 1,
1467 valign => 0, 1594 valign => 0,
1468 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1469 @_ 1597 @_
1470 ) 1598 )
1471} 1599}
1472 1600
1473sub _set_text { 1601sub _set_text {
… …
1483 $self->{text} = $text; 1611 $self->{text} = $text;
1484 1612
1485 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1487 1615
1488 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1489} 1617}
1490 1618
1491sub set_text { 1619sub set_text {
1492 my ($self, $text) = @_; 1620 my ($self, $text) = @_;
1493 1621
1494 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1623 $self->_set_text ($text);
1496 $self->update; 1624
1497 $self->check_size; 1625 $self->realloc;
1498} 1626}
1499 1627
1500sub get_text { 1628sub get_text {
1501 $_[0]{text} 1629 $_[0]{text}
1502} 1630}
… …
1505 my ($self) = @_; 1633 my ($self) = @_;
1506 1634
1507 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1508 1636
1509 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1638}
1517 1639
1518sub key_down { 1640sub key_down {
1519 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1520 1642
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1661 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1662 $self->_emit ('escape');
1541 } elsif ($uni) { 1663 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1665 }
1544 1666
1545 $self->_set_text ($text); 1667 $self->_set_text ($text);
1546 $self->update; 1668
1547 $self->check_size; 1669 $self->realloc;
1548} 1670}
1549 1671
1550sub focus_in { 1672sub focus_in {
1551 my ($self) = @_; 1673 my ($self) = @_;
1552 1674
… …
1632 if ($sym == 13) { 1754 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1638 $self->update; 1760 $self->update;
1639 1761
1640 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1679 1801
1680sub new { 1802sub new {
1681 my $class = shift; 1803 my $class = shift;
1682 1804
1683 $class->SUPER::new ( 1805 $class->SUPER::new (
1684 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1685 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1687 can_hover => 1, 1810 can_hover => 1,
1688 align => 0, 1811 align => 0,
1689 valign => 0, 1812 valign => 0,
1690 can_events => 1, 1813 can_events => 1,
1691 @_ 1814 @_
1692 ) 1815 )
1693} 1816}
1694 1817
1818sub activate { }
1819
1695sub button_up { 1820sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1697 1822
1823 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1826}
1703 1827
1704sub _draw { 1828sub _draw {
1705 my ($self) = @_; 1829 my ($self) = @_;
1706 1830
… …
1735 1859
1736sub new { 1860sub new {
1737 my $class = shift; 1861 my $class = shift;
1738 1862
1739 $class->SUPER::new ( 1863 $class->SUPER::new (
1740 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1741 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1868 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1869 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1870 state => 0,
… …
1749} 1874}
1750 1875
1751sub size_request { 1876sub size_request {
1752 my ($self) = @_; 1877 my ($self) = @_;
1753 1878
1754 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1755} 1880}
1756 1881
1757sub button_down { 1882sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1759 1884
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1764 } 1889 }
1765} 1890}
1766 1891
1767sub _draw { 1892sub _draw {
1768 my ($self) = @_; 1893 my ($self) = @_;
1769 1894
1770 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1771 1896
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1898
1774 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;
1775 1902
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1904
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1906
… …
2043 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2173 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2174 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2051 vertical => 0, 2178 vertical => 0,
2052 can_hover => 1, 2179 can_hover => 1,
2053 inner_pad => .05, 2180 inner_pad => 0.02,
2054 @_ 2181 @_
2055 ); 2182 );
2056 2183
2057 $self->set_value ($self->{range}[0]); 2184 $self->set_value ($self->{range}[0]);
2058 $self->update; 2185 $self->update;
2059 2186
2060 $self 2187 $self
2061} 2188}
2062 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
2063sub set_value { 2201sub set_value {
2064 my ($self, $value) = @_; 2202 my ($self, $value) = @_;
2065 2203
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2205
2068 $hi = $lo + 1 if $hi <= $lo; 2206 $hi = $lo + 1 if $hi <= $lo;
2069 2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2070 $value = $lo if $value < $lo; 2210 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2211 $value = $hi - $page if $value > $hi - $page;
2072 2212
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2214 if $unit;
2075 2215
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2217
2080 if ($value != $old_value) { 2218 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2219 $self->_emit (changed => $value);
2082 $self->update; 2220 $self->update;
2083 } 2221 }
2084} 2222}
2085 2223
2086sub size_request { 2224sub size_request {
2087 my ($self) = @_; 2225 my ($self) = @_;
2088 2226
2089 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2228}
2094 2229
2095sub button_down { 2230sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2097 2232
2098 $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
2099 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
2100} 2238}
2101 2239
2102sub mouse_motion { 2240sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2245
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2247
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2249
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2251 }
2114} 2252}
2115 2253
2116sub update { 2254sub update {
2117 my ($self) = @_; 2255 my ($self) = @_;
2118 2256
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2258 $self->set_value ($self->{range}[0]);
2121 2259
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2123 2262
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2264
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2267
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2268 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2269 $value = $value * $self->{scale} + $self->{offset};
2130 2270
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2272 $self->{knob_w} = $knob_w;
2138 }); 2273 });
2139 2274
2140 $self->SUPER::update; 2275 $self->SUPER::update;
2141} 2276}
2142 2277
… …
2148 glScale $self->{w}, $self->{h}; 2283 glScale $self->{w}, $self->{h};
2149 2284
2150 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2152 2287
2288 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2290 }
2156 2291
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2294
… …
2166 # draw handle 2301 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2303
2169 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2170} 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 (@_) }
2171 2347
2172############################################################################# 2348#############################################################################
2173 2349
2174package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2175 2351
… …
2205 2381
2206 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2383 $self->reflow;
2208} 2384}
2209 2385
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2386sub size_allocate {
2230 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2231 2388
2232 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2233 2392
2234 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2396
2238 $self->reflow; 2397 $self->reflow;
2239} 2398}
2240 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
2241sub add_paragraph { 2434sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2243 2436
2244 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2245 2438 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2249 2442
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $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]);
2253 $self->{children}[1]->update;
2254} 2444}
2255 2445
2256sub update { 2446sub update {
2257 my ($self) = @_; 2447 my ($self) = @_;
2258 2448
… …
2261 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2262 2452
2263 delete $self->{texture}; 2453 delete $self->{texture};
2264 2454
2265 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2266 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2459 my $height = 0;
2268 2460
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2270 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 }
2271 2476
2272 $self->{height} = $height; 2477 $self->{height} = $height;
2273 2478
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2480
2276 delete $self->{texture}; 2481 delete $self->{texture};
2277 } 2482 }
2278 2483
2279 $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 {
2280 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2282 2487
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2287 2489
2288 my $y0 = $top; 2490 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2290 2492
2291 my $y = 0; 2493 my $y = 0;
2292 2494
2293 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2294 2496
2295 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2296 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
2297 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2504 my $h = $par->[1];
2299 2505
2300 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2303 2510
2304 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 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;
2306 } 2515 }
2307 2516
2308 $y += $h; 2517 $y += $h;
2309 } 2518 }
2310 2519
2311 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2312 }; 2521 };
2313 }); 2522 });
2314} 2523}
2315 2524
2316sub _draw { 2525sub _draw {
2317 my ($self) = @_; 2526 my ($self) = @_;
2318 2527
2319 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2322 $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});
2323 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2324 2533
2325 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2326 2535
2327} 2536}
… …
2376 2585
2377sub new { 2586sub new {
2378 my $class = shift; 2587 my $class = shift;
2379 2588
2380 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2381 state => 0, 2590 state => 0,
2382 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2383 @_ 2592 @_
2384 ); 2593 );
2385 2594
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2595 $self
2392} 2596}
2393 2597
2394sub toggle_flopper { 2598sub toggle_flopper {
2395 my ($self) = @_; 2599 my ($self) = @_;
2396 2600
2397 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2602}
2409 2603
2410############################################################################# 2604#############################################################################
2411 2605
2412package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2426 2620
2427sub set_tooltip_from { 2621sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2429 2623
2430 $self->add (new CFClient::UI::Label 2624 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2625 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2627 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2631 );
2437} 2632}
2438 2633
2439sub size_request { 2634sub size_request {
2440 my ($self) = @_; 2635 my ($self) = @_;
… …
2443 2638
2444 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2445} 2640}
2446 2641
2447sub size_allocate { 2642sub size_allocate {
2448 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2449 2644
2645 return unless $changed;
2646
2450 $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 });
2451} 2666}
2452 2667
2453sub _draw { 2668sub _draw {
2454 my ($self) = @_; 2669 my ($self) = @_;
2455 2670
… …
2472 glVertex $w, $h; 2687 glVertex $w, $h;
2473 glVertex $w, 0; 2688 glVertex $w, 0;
2474 glEnd; 2689 glEnd;
2475 2690
2476 glTranslate 2 - 0.375, 2 - 0.375; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2477 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2478} 2694}
2479 2695
2480############################################################################# 2696#############################################################################
2481 2697
… …
2486use CFClient::OpenGL; 2702use CFClient::OpenGL;
2487 2703
2488sub new { 2704sub new {
2489 my $class = shift; 2705 my $class = shift;
2490 2706
2491 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2492 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2493 @_, 2710 @_,
2494 ) 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
2495} 2728}
2496 2729
2497sub size_request { 2730sub size_request {
2498 (32, 8) 2731 (32, 8)
2499} 2732}
2500 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2501sub _draw { 2742sub _draw {
2502 my ($self) = @_; 2743 my ($self) = @_;
2503 2744
2504 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
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2757
2507 # TODO animation
2508 if ($tex) { 2758 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2514 } 2764 }
2515} 2765}
2516 2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2517############################################################################# 2776#############################################################################
2518 2777
2519package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2520 2779
2521our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2522 2781
2523sub new { 2782sub new {
2524 my $class = shift; 2783 my $class = shift;
2525 2784
2526 my %args = @_;
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2550 can_hover => 1, 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2551 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_;
2556
2557 # todo: maybe put examine on 1? but should just be a tooltip :(
2558 if ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) {
2563 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ],
2572 );
2573
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 }
2576
2577 1
2578 },
2579 %args
2580 );
2581
2582 $self->add (new CFClient::UI::Face
2583 can_events => 0,
2584 face => $item->{face},
2585 anim => $item->{anim},
2586 animspeed => $item->{animspeed},
2587 );
2588
2589 $self->add (new CFClient::UI::Label
2590 can_events => 0,
2591 text => $desc,
2592 );
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_, 2787 @_,
2609 ); 2788 );
2610 2789
2611 $self 2790 $self
2612} 2791}
… …
2622 or ($a->{name} cmp $b->{name}) 2801 or ($a->{name} cmp $b->{name})
2623 } @$items; 2802 } @$items;
2624 2803
2625 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2626 2805
2806 my $row = 0;
2627 for my $item (@items) { 2807 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2 2808 CFClient::Item::update_widgets $item;
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631 2809
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2633 } 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2634 2813
2635 $self->{scrolled}->add (@items); 2814 $row++;
2636 2815 }
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638}
2639
2640sub size_request {
2641 my ($self) = @_;
2642 ($self->{req_w}, $self->{req_h});
2643} 2816}
2644 2817
2645############################################################################# 2818#############################################################################
2646 2819
2647package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2682 2855
2683# 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)
2684sub popup { 2857sub popup {
2685 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2686 2859
2687 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2688 2861
2689 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self; 2863 $GRAB = $self;
2691 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2692 2865
2693 $self->show; 2866 $self->show;
2694 $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);
2695} 2868}
2696 2869
2697sub mouse_motion { 2870sub mouse_motion {
2698 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2699 2872
… …
2707 2880
2708 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB; 2882 undef $GRAB;
2710 $self->hide; 2883 $self->hide;
2711 2884
2712 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2714 } 2887 }
2715} 2888}
2716 2889
2717############################################################################# 2890#############################################################################
… …
2752 # TODO: doesn't handle markup well (read as: at all) 2925 # TODO: doesn't handle markup well (read as: at all)
2753 my $short = $item->{count} > 1 2926 my $short = $item->{count} > 1
2754 ? "<b>$item->{count} ×</b> $item->{text}" 2927 ? "<b>$item->{count} ×</b> $item->{text}"
2755 : $item->{text}; 2928 : $item->{text};
2756 2929
2757 my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759 for ($short) { 2930 for ($short) {
2760 s/^\s+//; 2931 s/^\s+//;
2761 s/\s+/ /g; 2932 s/\s+/ /g;
2762 my $len = int 40 / $fontsize;
2763 substr $_, $len, length, "…" if $len < length;
2764 } 2933 }
2765 2934
2766 new CFClient::UI::Label 2935 new CFClient::UI::Label
2767 markup => $short, 2936 markup => $short,
2768 tooltip => $item->{tooltip}, 2937 tooltip => $item->{tooltip},
2769 tooltip_font => $::FONT_PROP, 2938 tooltip_font => $::FONT_PROP,
2770 tooltip_width => 0.67, 2939 tooltip_width => 0.67,
2771 fontsize => $fontsize, 2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2772 fg => $item->{fg}, 2942 fg => $item->{fg},
2773 can_events => 1, 2943 can_events => 1,
2774 can_hover => 1 2944 can_hover => 1
2775 }; 2945 };
2776 } 2946 }
… …
2782sub add { 2952sub add {
2783 my ($self, $text, %arg) = @_; 2953 my ($self, $text, %arg) = @_;
2784 2954
2785 $text =~ s/^\s+//; 2955 $text =~ s/^\s+//;
2786 $text =~ s/\s+$//; 2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2787 2959
2788 my $timeout = time + ((delete $arg{timeout}) || 60); 2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2789 2961
2790 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2791 2963
… …
2813 } 2985 }
2814 2986
2815 $self->reorder; 2987 $self->reorder;
2816} 2988}
2817 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
2818############################################################################# 3000#############################################################################
2819 3001
2820package CFClient::UI::Root; 3002package CFClient::UI::Root;
2821 3003
2822our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
… …
2824use CFClient::OpenGL; 3006use CFClient::OpenGL;
2825 3007
2826sub new { 3008sub new {
2827 my $class = shift; 3009 my $class = shift;
2828 3010
2829 $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
3012 visible => 1,
2830 @_, 3013 @_,
2831 ) 3014 );
3015
3016 Scalar::Util::weaken ($self->{root} = $self);
3017
3018 $self
2832} 3019}
2833 3020
2834sub configure { 3021sub configure {
2835 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2836 3023
2837 $self->{w} = $w; 3024 $self->{w} = $w;
2838 $self->{h} = $h; 3025 $self->{h} = $h;
2839} 3026}
2840 3027
2841sub check_size { 3028sub reconfigure {
2842 my ($self) = @_; 3029 my ($self) = @_;
2843 3030
3031 $self->SUPER::reconfigure;
3032
2844 $self->size_allocate ($self->{w}, $self->{h}) 3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
2845 if $self->{w}; 3034 if $self->{w};
2846} 3035}
2847 3036
2848sub size_request { 3037sub size_request {
2849 my ($self) = @_; 3038 my ($self) = @_;
2850 3039
2851 ($self->{w}, $self->{h}) 3040 ($self->{w}, $self->{h})
2852} 3041}
2853 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
2854sub size_allocate { 3057sub size_allocate {
2855 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h, $changed) = @_;
2856
2857 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2858 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2859
2860 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2861 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2862 3059
2863 for my $child ($self->children) { 3060 for my $child ($self->children) {
2864 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)};
2865 3062
2866 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3063 $X = $child->{force_x} if exists $child->{force_x};
2867 if exists $child->{req_x}; 3064 $Y = $child->{force_y} if exists $child->{force_y};
2868 3065
2869 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3066 $X = _to_pixel $X, $W, $self->{w};
2870 if exists $child->{req_y}; 3067 $Y = _to_pixel $Y, $H, $self->{h};
2871
2872 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2873 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2874 3068
2875 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
2876 } 3070 }
2877} 3071}
2878 3072
… …
2889} 3083}
2890 3084
2891sub update { 3085sub update {
2892 my ($self) = @_; 3086 my ($self) = @_;
2893 3087
2894 $self->check_size;
2895 $::WANT_REFRESH++; 3088 $::WANT_REFRESH++;
2896} 3089}
2897 3090
2898sub add { 3091sub add {
2899 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
2900 3093
2901 for my $child (@children) {
2902 $child->{toplevel} = 1; 3094 $_->{is_toplevel} = 1
2903 3095 for @children;
2904 # integerise window positions
2905 $child->{x} = int $child->{x};
2906 $child->{y} = int $child->{y};
2907 }
2908 3096
2909 $self->SUPER::add (@children); 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 }
2910} 3113}
2911 3114
2912sub on_refresh { 3115sub on_refresh {
2913 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2914 3117
… …
2927 while ($self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2928 $_->() 3131 $_->()
2929 for values %{delete $self->{refresh_hook}}; 3132 for values %{delete $self->{refresh_hook}};
2930 } 3133 }
2931 3134
2932 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
2933 my @queue = ([], []); 3136 my @queue;
2934 3137
2935 for (;;) { 3138 while () {
2936 if ($self->{check_size}) { 3139 if ($self->{realloc}) {
2937 # heuristic: check containers last 3140 #TODO use array-of-depth approach
2938 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3141
2939 for values %{delete $self->{check_size}} 3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
2940 } 3144 }
2941 3145
2942 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3146 my $widget = pop @queue || last;
2943 3147
2944 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3148 $widget->{visible} or last; # do not resize invisible widgets
2945 ? @$widget{qw(user_w user_h)} 3149
2946 : $widget->size_request; 3150 my ($w, $h) = $widget->size_request;
2947 3151
2948 if (delete $widget->{force_alloc} 3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
2949 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
2950 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3154
2951 3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
2952 $widget->{req_w} = $w; 3158 $widget->{req_w} = $w;
2953 $widget->{req_h} = $h; 3159 $widget->{req_h} = $h;
2954 3160
2955 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2956 3162
2957 $widget->{parent}->check_size 3163 push @queue, $widget->{parent}
2958 if $widget->{parent}; 3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2959 }
2960 } 3165 }
2961 } 3166 }
2962 3167
2963 while ($self->{size_alloc}) { 3168 while (my $size_alloc = delete $self->{size_alloc}) {
2964 for (values %{delete $self->{size_alloc}}) { 3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2965 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;
2966 3177
2967 $w = 0 if $w < 0; 3178 $w = 0 if $w < 0;
2968 $h = 0 if $h < 0; 3179 $h = 0 if $h < 0;
2969 3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
2970 $widget->{w} = $w; 3186 $widget->{w} = $w;
2971 $widget->{h} = $h; 3187 $widget->{h} = $h;
2972 $widget->size_allocate ($w, $h); 3188
2973 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h, $changed);
2974 } 3190 }
2975 } 3191 }
2976 3192
2977 while ($self->{post_alloc_hook}) { 3193 while ($self->{post_alloc_hook}) {
2978 $_->() 3194 $_->()
… …
2983 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2984 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2985 3201
2986 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2987 glLoadIdentity; 3203 glLoadIdentity;
2988 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2989 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2990 glLoadIdentity; 3206 glLoadIdentity;
2991 3207
2992 $self->_draw; 3208 $self->_draw;
2993} 3209}
… …
2995############################################################################# 3211#############################################################################
2996 3212
2997package CFClient::UI; 3213package CFClient::UI;
2998 3214
2999$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
3000$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3001 3217
30021 32181
3003 3219

Diff Legend

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