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.256 by root, Tue May 30 01:42:16 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
33 $layout
34}
35
36sub set_layout {
37 my ($layout) = @_;
38 $LAYOUT = $layout;
39}
18 40
19sub check_tooltip { 41sub check_tooltip {
20 if (!$GRAB) { 42 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
23 45
24 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
25 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
26 50
27 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
28 52
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 54
31 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 56 $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 } 57 }
43 58
44 return; 59 return;
45 } 60 }
46 } 61 }
… …
50 delete $TOOLTIP->{owner}; 65 delete $TOOLTIP->{owner};
51} 66}
52 67
53# class methods for events 68# class methods for events
54sub feed_sdl_key_down_event { 69sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 70 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 71 if $FOCUS;
57} 72}
58 73
59sub feed_sdl_key_up_event { 74sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 75 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 76 if $FOCUS;
62} 77}
63 78
64sub feed_sdl_button_down_event { 79sub feed_sdl_button_down_event {
65 my ($ev) = @_; 80 my ($ev) = @_;
… …
74 check_tooltip; 89 check_tooltip;
75 } 90 }
76 91
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 92 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 93
79 if ($GRAB) { 94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 95 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 96}
84 97
85sub feed_sdl_button_up_event { 98sub feed_sdl_button_up_event {
86 my ($ev) = @_; 99 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
88 101
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 102 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 103
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 104 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 105
93 if ($GRAB) { 106 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 107 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 108
98 if (!$BUTTON_STATE) { 109 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 110 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 111 $grab->update if $grab;
101 $GRAB->update if $GRAB; 112 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 128 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 129
119 check_tooltip; 130 check_tooltip;
120 } 131 }
121 132
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 134 if $HOVER;
126} 135}
127 136
128# convert position array to integers 137# convert position array to integers
129sub harmonize { 138sub harmonize {
130 my ($vals) = @_; 139 my ($vals) = @_;
… …
136 $rem += $_ - $i; 145 $rem += $_ - $i;
137 $_ = $i; 146 $_ = $i;
138 } 147 }
139} 148}
140 149
150sub full_refresh {
151 # make a copy, otherwise for complains about freed values.
152 my @widgets = values %WIDGET;
153
154 $_->update
155 for @widgets;
156}
157
158sub reconfigure_widgets {
159 # make a copy, otherwise C<for> complains about freed values.
160 my @widgets = values %WIDGET;
161
162 $_->reconfigure
163 for @widgets;
164}
165
141# call when resolution changes etc. 166# call when resolution changes etc.
142sub rescale_widgets { 167sub rescale_widgets {
143 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
144 169
145 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $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}; 176 $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}; 177 $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}; 178 $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}; 179 $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}; 180 $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}; 181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
155 } 185 }
156
157 $widget->reconfigure;
158 } 186 }
187
188 reconfigure_widgets;
159} 189}
160 190
161############################################################################# 191#############################################################################
162 192
163package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
168 198
169sub new { 199sub new {
170 my $class = shift; 200 my $class = shift;
171 201
172 my $self = bless { 202 my $self = bless {
173 x => 0, 203 x => "center",
174 y => 0, 204 y => "center",
175 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
176 can_events => 1, 208 can_events => 1,
177 @_ 209 @_
178 }, $class; 210 }, $class;
179 211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223
180 for (keys %$self) { 224 for (keys %$self) {
181 if (/^connect_(.*)$/) { 225 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
183 } 227 }
184 } 228 }
185 229
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
188 $self 230 $self
189} 231}
190 232
191sub destroy { 233sub destroy {
192 my ($self) = @_; 234 my ($self) = @_;
… …
201 return if $self->{parent}; 243 return if $self->{parent};
202 244
203 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
204} 246}
205 247
206sub hide { 248sub set_visible {
207 my ($self) = @_; 249 my ($self) = @_;
250
251 return if $self->{visible};
252
253 $self->{root} = $self->{parent}{root};
254 $self->{visible} = $self->{parent}{visible} + 1;
255
256 $self->emit (visibility_change => 1);
257
258 $self->realloc if !exists $self->{req_w};
259
260 $_->set_visible for $self->children;
261}
262
263sub set_invisible {
264 my ($self) = @_;
265
266 return unless $self->{visible};
267
268 $_->set_invisible for $self->children;
269
270 delete $self->{root};
271 delete $self->{visible};
208 272
209 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
211 275
276 CFClient::UI::check_tooltip
277 if $TOOLTIP->{owner} == $self;
278
279 $self->focus_out;
280
281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
299}
300
301sub hide {
302 my ($self) = @_;
303
304 $self->set_invisible;
305
212 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
213 if $self->{parent}; 307 if $self->{parent};
214} 308}
215 309
216sub move { 310sub move_abs {
217 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
218 312
219 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
222 316
223 $self->update; 317 $self->update;
224} 318}
225 319
226sub set_size { 320sub set_size {
227 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
228 322
229 $self->{user_w} = $w; 323 $self->{force_w} = $w;
230 $self->{user_h} = $h; 324 $self->{force_h} = $h;
231 325
232 $self->check_size; 326 $self->realloc;
233} 327}
234 328
235sub size_request { 329sub size_request {
236 require Carp; 330 require Carp;
237 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
239 333
240sub configure { 334sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
242 336
243 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
246 342
247 # use alignment to adjust x, y 343 # use alignment to adjust x, y
248 344
249 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 347 }
254 348
255 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 350 $self->{x} = $x;
257 $self->{y} = $y; 351 $self->{y} = $y;
258 $self->update; 352 $self->update;
259 } 353 }
260 354
261 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
263 } 359 }
264} 360}
265 361
266sub size_allocate { 362sub size_allocate {
267 # nothing to be done 363 # nothing to be done
268} 364}
269 365
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 366sub children {
278} 367}
279 368
280sub set_max_size { 369sub set_max_size {
281 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 373 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 374}
286 375
287sub set_tooltip { 376sub set_tooltip {
288 my ($self, $tooltip) = @_; 377 my ($self, $tooltip) = @_;
378
379 $tooltip =~ s/^\s+//;
380 $tooltip =~ s/\s+$//;
381
382 return if $self->{tooltip} eq $tooltip;
289 383
290 $self->{tooltip} = $tooltip; 384 $self->{tooltip} = $tooltip;
291 385
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 386 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 387 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 409 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 410 return unless $self->{can_focus};
317 411
318 my $focus = $FOCUS; $FOCUS = $self; 412 my $focus = $FOCUS; $FOCUS = $self;
319 413
320 $self->emit (focus_in => $focus); 414 $self->_emit (focus_in => $focus);
321 415
322 $focus->update if $focus; 416 $focus->update if $focus;
323 $FOCUS->update; 417 $FOCUS->update;
324} 418}
325 419
… …
328 422
329 return unless $FOCUS == $self; 423 return unless $FOCUS == $self;
330 424
331 my $focus = $FOCUS; undef $FOCUS; 425 my $focus = $FOCUS; undef $FOCUS;
332 426
333 $self->emit (focus_out => $focus); 427 $self->_emit (focus_out => $focus);
334 428
335 $focus->update if $focus; #? 429 $focus->update if $focus; #?
430
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432 unless $FOCUS;
336} 433}
337 434
338sub mouse_motion { } 435sub mouse_motion { }
339sub button_up { } 436sub button_up { }
340sub key_down { } 437sub key_down { }
341sub key_up { } 438sub key_up { }
342 439
343sub button_down { 440sub button_down {
344 my ($self, $ev, $x, $y) = @_; 441 my ($self, $ev, $x, $y) = @_;
345 442
346 $self->focus_in; 443 $self->focus_in;
… …
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452sub find_widget {
453 my ($self, $x, $y) = @_;
454
455 return () unless $self->{can_events};
456
457 return $self
458 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
459 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
460
461 ()
462}
463
464sub set_parent {
465 my ($self, $parent) = @_;
466
467 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible};
470}
471
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc {
496 my ($self) = @_;
497
498 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self};
500
501 $self->{root}{realloc}{$self} = $self;
502 $self->{root}->update;
503 } else {
504 delete $self->{req_w};
505 }
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
520}
354 521
355sub draw { 522sub draw {
356 my ($self) = @_; 523 my ($self) = @_;
357 524
358 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
375 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
376 glEnd; 543 glEnd;
377 glDisable GL_BLEND; 544 glDisable GL_BLEND;
378 } 545 }
379 546
380 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
381 glPushMatrix; 548 glPushMatrix;
382 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 552 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 553 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 554 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 555 glVertex 0 , $self->{h} - 1;
389 glEnd; 556 glEnd;
390 glPopMatrix; 557 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 559 }
393} 560}
394 561
395sub _draw { 562sub _draw {
396 my ($self) = @_; 563 my ($self) = @_;
397 564
398 warn "no draw defined for $self\n"; 565 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} 566}
448 567
449sub DESTROY { 568sub DESTROY {
450 my ($self) = @_; 569 my ($self) = @_;
451 570
… …
509 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
511} 630}
512 631
513sub size_request { 632sub size_request {
514 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
515} 636}
516 637
517sub draw { } 638sub draw { }
518 639
519############################################################################# 640#############################################################################
… …
548 $self->{children} = [ 669 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
551 ]; 672 ];
552 673
553 $self->check_size (1); 674 $self->realloc;
554 $self->update;
555} 675}
556 676
557sub children { 677sub children {
558 @{ $_[0]{children} } 678 @{ $_[0]{children} }
559} 679}
… …
564 delete $child->{parent}; 684 delete $child->{parent};
565 $child->hide; 685 $child->hide;
566 686
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 688
569 $self->check_size; 689 $self->realloc;
570 $self->update;
571} 690}
572 691
573sub clear { 692sub clear {
574 my ($self) = @_; 693 my ($self) = @_;
575 694
… …
579 for (@$children) { 698 for (@$children) {
580 delete $_->{parent}; 699 delete $_->{parent};
581 $_->hide; 700 $_->hide;
582 } 701 }
583 702
584 $self->check_size; 703 $self->realloc;
585 $self->update;
586} 704}
587 705
588sub find_widget { 706sub find_widget {
589 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
590 708
… …
643sub size_request { 761sub size_request {
644 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
645} 763}
646 764
647sub size_allocate { 765sub size_allocate {
648 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
649 767
650 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
651} 769}
652 770
653############################################################################# 771#############################################################################
… …
670 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
671 $self->SUPER::update; 789 $self->SUPER::update;
672} 790}
673 791
674sub size_allocate { 792sub size_allocate {
675 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
676 794
677 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
678 $self->update; 796 $self->update
797 if $changed;
679} 798}
680 799
681sub _render { 800sub _render {
682 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
683} 802}
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 808 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
691 810
692 $self->_render; 811 $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 }; 812 };
701} 813}
702 814
703sub _draw { 815sub _draw {
704 my ($self) = @_; 816 my ($self) = @_;
… …
708 my $tex = $self->{texture} 820 my $tex = $self->{texture}
709 or return; 821 or return;
710 822
711 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 825 glColor 1, 1, 1, 1;
714 826
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 828
717 glDisable GL_TEXTURE_2D; 829 glDisable GL_TEXTURE_2D;
718} 830}
… …
721 833
722package CFClient::UI::ViewPort; 834package CFClient::UI::ViewPort;
723 835
724our @ISA = CFClient::UI::Window::; 836our @ISA = CFClient::UI::Window::;
725 837
838sub new {
839 my $class = shift;
840
841 $class->SUPER::new (
842 scroll_x => 0,
843 scroll_y => 1,
844 @_,
845 )
846}
847
726sub size_request { 848sub size_request {
727 my ($self) = @_; 849 my ($self) = @_;
728 850
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 851 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 852
732 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
733} 857}
734 858
735sub size_allocate { 859sub size_allocate {
736 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
737 861
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
864
865 $self->child->configure (0, 0, $w, $h);
738 $self->update; 866 $self->update;
739} 867}
740 868
741sub set_offset { 869sub set_offset {
742 my ($self, $x, $y) = @_; 870 my ($self, $x, $y) = @_;
… …
793 my $class = shift; 921 my $class = shift;
794 922
795 my $self; 923 my $self;
796 924
797 my $slider = new CFClient::UI::Slider 925 my $slider = new CFClient::UI::Slider
798 vertical => 1, 926 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 927 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 928 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 929 $self->{vp}->set_offset (0, $_[1]);
802 }, 930 },
803 ; 931 ;
804 932
805 $self = $class->SUPER::new ( 933 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 934 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 935 slider => $slider,
808 @_, 936 @_,
809 ); 937 );
810 938
811 $self->{vp}->add ($self->{scrolled}); 939 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 940 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 941 $self->add ($self->{slider});
814 942
815 $self 943 $self
944}
945
946sub update {
947 my ($self) = @_;
948
949 $self->SUPER::update;
950
951 # todo: overwrite size_allocate of child
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954}
955
956sub size_allocate {
957 my ($self, $w, $h, $changed) = @_;
958
959 $self->SUPER::size_allocate ($w, $h, $changed);
960
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 963}
817 964
818#TODO# update range on size_allocate depending on child 965#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 966# update viewport offset on scroll
820 967
… …
864 1011
865our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
866 1013
867use CFClient::OpenGL; 1014use CFClient::OpenGL;
868 1015
869my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 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); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1023
873sub new { 1024sub new {
874 my $class = shift; 1025 my $class = shift;
875 1026
876 # TODO: user_x, user_y, overwrite moveto?
877
878 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1030 border => 0.6,
882 toplevel => 1, 1031 is_toplevel => 1,
883 can_events => 1, 1032 can_events => 1,
884 @_ 1033 @_
885 ); 1034 );
886 1035
887 $self->{title} &&= new CFClient::UI::Label 1036 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 1037 align => 0,
… …
907 $h + $self->border * 2, 1056 $h + $self->border * 2,
908 ) 1057 )
909} 1058}
910 1059
911sub size_allocate { 1060sub size_allocate {
912 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
913 1064
914 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
916 1067
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
941 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
942 1093
943 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
945 1096
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099
1100 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1102 };
951 1103
952 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1108 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
958 1110
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
960 1112
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1114 };
964 } 1115 }
965} 1116}
966 1117
967sub button_up { 1118sub button_up {
… …
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1138
988 my $border = $self->border; 1139 my $border = $self->border;
989 1140
990 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1146
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
998 1149
999 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1153 $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); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1155 }
1010 1156
1011 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1012 1158
… …
1028sub new { 1174sub new {
1029 my $class = shift; 1175 my $class = shift;
1030 1176
1031 $class->SUPER::new ( 1177 $class->SUPER::new (
1032 col_expand => [], 1178 col_expand => [],
1033 @_ 1179 @_,
1034 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1185}
1036 1186
1037sub add { 1187sub add {
1038 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1039 1189
1040 $child->set_parent ($self); 1190 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1042 1192
1043 $child->check_size; 1193 $self->realloc;
1044} 1194}
1045 1195
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1197sub clear {
1052 my ($self) = @_; 1198 my ($self) = @_;
1053 1199
1054 my @children = $self->children; 1200 my @children = $self->children;
1055 delete $self->{children}; 1201 delete $self->{children};
… …
1057 for (@children) { 1203 for (@children) {
1058 delete $_->{parent}; 1204 delete $_->{parent};
1059 $_->hide; 1205 $_->hide;
1060 } 1206 }
1061 1207
1062 $self->update; 1208 $self->realloc;
1063} 1209}
1064 1210
1065sub get_wh { 1211sub get_wh {
1066 my ($self) = @_; 1212 my ($self) = @_;
1067 1213
… …
1094 (sum @$hs), 1240 (sum @$hs),
1095 ) 1241 )
1096} 1242}
1097 1243
1098sub size_allocate { 1244sub size_allocate {
1099 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1100 1246
1101 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1102 1248
1103 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1105 1251
1106 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1309 }
1164} 1310}
1165 1311
1166############################################################################# 1312#############################################################################
1167 1313
1314package CFClient::UI::Box;
1315
1316our @ISA = CFClient::UI::Container::;
1317
1318sub size_request {
1319 my ($self) = @_;
1320
1321 $self->{vertical}
1322 ? (
1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1325 )
1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1330}
1331
1332sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_;
1334
1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children};
1337
1338 my @req;
1339
1340 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children;
1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1355 for 0 .. $#$children;
1356 }
1357 }
1358
1359 CFClient::UI::harmonize \@req;
1360
1361 my $pos = 0;
1362 for (0 .. $#$children) {
1363 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365
1366 $pos += $alloc;
1367 }
1368
1369 1
1370}
1371
1372#############################################################################
1373
1168package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1169 1375
1170# TODO: wrap into common Box base class
1171
1172our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1173 1377
1174sub size_request { 1378sub new {
1175 my ($self) = @_; 1379 my $class = shift;
1176 1380
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1178 1382 vertical => 0,
1179 ( 1383 @_,
1180 (List::Util::sum map $_->[0], @alloc),
1181 (List::Util::max map $_->[1], @alloc),
1182 ) 1384 )
1183} 1385}
1184 1386
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############################################################################# 1387#############################################################################
1227 1388
1228package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1229 1390
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1233 1392
1234sub size_request { 1393sub new {
1235 my ($self) = @_; 1394 my $class = shift;
1236 1395
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1238 1397 vertical => 1,
1239 ( 1398 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1399 )
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} 1400}
1283 1401
1284############################################################################# 1402#############################################################################
1285 1403
1286package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1297 #bg => none 1415 #bg => none
1298 #active_bg => none 1416 #active_bg => none
1299 #font => default_font 1417 #font => default_font
1300 #text => initial text 1418 #text => initial text
1301 #markup => initial narkup 1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1422 layout => (new CFClient::Layout),
1303 fontsize => 1, 1423 fontsize => 1,
1304 align => -1, 1424 align => -1,
1305 valign => -1, 1425 valign => -1,
1306 padding => 2, 1426 padding => 2,
… …
1347 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1348 1468
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1351 1471
1472 $self->realloc;
1352 $self->update; 1473 $self->update;
1353 $self->check_size;
1354} 1474}
1355 1475
1356sub set_markup { 1476sub set_markup {
1357 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1358 1478
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1483
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1366 1486
1487 $self->realloc;
1367 $self->update; 1488 $self->update;
1368 $self->check_size;
1369} 1489}
1370 1490
1371sub size_request { 1491sub size_request {
1372 my ($self) = @_; 1492 my ($self) = @_;
1373 1493
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1499
1378 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1379 1501
1380 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1392 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1393 ) 1515 )
1394} 1516}
1395 1517
1396sub size_allocate { 1518sub size_allocate {
1397 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1398 1520
1399 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1400} 1523}
1401 1524
1402sub set_fontsize { 1525sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1404 1527
1405 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1529 delete $self->{texture};
1407 1530
1408 $self->update; 1531 $self->realloc;
1409 $self->check_size;
1410} 1532}
1411 1533
1412sub _draw { 1534sub _draw {
1413 my ($self) = @_; 1535 my ($self) = @_;
1414 1536
… …
1416 1538
1417 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1540 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1542 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1546
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1548
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1464 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1465 can_hover => 1, 1589 can_hover => 1,
1466 can_focus => 1, 1590 can_focus => 1,
1467 valign => 0, 1591 valign => 0,
1468 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1469 @_ 1594 @_
1470 ) 1595 )
1471} 1596}
1472 1597
1473sub _set_text { 1598sub _set_text {
… …
1483 $self->{text} = $text; 1608 $self->{text} = $text;
1484 1609
1485 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1487 1612
1488 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1489} 1614}
1490 1615
1491sub set_text { 1616sub set_text {
1492 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1493 1618
1494 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1620 $self->_set_text ($text);
1496 $self->update; 1621
1497 $self->check_size; 1622 $self->realloc;
1498} 1623}
1499 1624
1500sub get_text { 1625sub get_text {
1501 $_[0]{text} 1626 $_[0]{text}
1502} 1627}
… …
1505 my ($self) = @_; 1630 my ($self) = @_;
1506 1631
1507 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1508 1633
1509 ($w + 1, $h) # add 1 for cursor 1634 ($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} 1635}
1517 1636
1518sub key_down { 1637sub key_down {
1519 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1520 1639
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1658 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1659 $self->_emit ('escape');
1541 } elsif ($uni) { 1660 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1662 }
1544 1663
1545 $self->_set_text ($text); 1664 $self->_set_text ($text);
1546 $self->update; 1665
1547 $self->check_size; 1666 $self->realloc;
1548} 1667}
1549 1668
1550sub focus_in { 1669sub focus_in {
1551 my ($self) = @_; 1670 my ($self) = @_;
1552 1671
… …
1632 if ($sym == 13) { 1751 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1638 $self->update; 1757 $self->update;
1639 1758
1640 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1690 can_events => 1, 1809 can_events => 1,
1691 @_ 1810 @_
1692 ) 1811 )
1693} 1812}
1694 1813
1814sub activate { }
1815
1695sub button_up { 1816sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1697 1818
1819 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1822}
1703 1823
1704sub _draw { 1824sub _draw {
1705 my ($self) = @_; 1825 my ($self) = @_;
1706 1826
… …
1758 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1759 1879
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1764 } 1884 }
1765} 1885}
1766 1886
1767sub _draw { 1887sub _draw {
1768 my ($self) = @_; 1888 my ($self) = @_;
… …
2043 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2165 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2166 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2167 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
2051 vertical => 0, 2171 vertical => 0,
2052 can_hover => 1, 2172 can_hover => 1,
2053 inner_pad => .05, 2173 inner_pad => 0.02,
2054 @_ 2174 @_
2055 ); 2175 );
2056 2176
2057 $self->set_value ($self->{range}[0]); 2177 $self->set_value ($self->{range}[0]);
2058 $self->update; 2178 $self->update;
2059 2179
2060 $self 2180 $self
2061} 2181}
2062 2182
2183sub changed { }
2184
2185sub set_range {
2186 my ($self, $range) = @_;
2187
2188 ($range, $self->{range}) = ($self->{range}, $range);
2189
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}";
2192}
2193
2063sub set_value { 2194sub set_value {
2064 my ($self, $value) = @_; 2195 my ($self, $value) = @_;
2065 2196
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2197 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2198
2068 $hi = $lo + 1 if $hi <= $lo; 2199 $hi = $lo + 1 if $hi <= $lo;
2069 2200
2201 $page = $hi - $lo if $page > $hi - $lo;
2202
2070 $value = $lo if $value < $lo; 2203 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2204 $value = $hi - $page if $value > $hi - $page;
2072 2205
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2206 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2207 if $unit;
2075 2208
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2210
2080 if ($value != $old_value) { 2211 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2212 $self->_emit (changed => $value);
2082 $self->update; 2213 $self->update;
2083 } 2214 }
2084} 2215}
2085 2216
2086sub size_request { 2217sub size_request {
… …
2094 2225
2095sub button_down { 2226sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
2097 2228
2098 $self->SUPER::button_down ($ev, $x, $y); 2229 $self->SUPER::button_down ($ev, $x, $y);
2230
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232
2099 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
2100} 2234}
2101 2235
2102sub mouse_motion { 2236sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2239 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2241
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2242 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2243
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2245
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2247 }
2114} 2248}
2115 2249
2116sub update { 2250sub update {
2117 my ($self) = @_; 2251 my ($self) = @_;
2118 2252
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2254 $self->set_value ($self->{range}[0]);
2121 2255
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
2123 2258
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2260
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2263
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2264 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2265 $value = $value * $self->{scale} + $self->{offset};
2130 2266
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; 2267 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2268 $self->{knob_w} = $knob_w;
2138 }); 2269 });
2139 2270
2140 $self->SUPER::update; 2271 $self->SUPER::update;
2141} 2272}
2142 2273
… …
2148 glScale $self->{w}, $self->{h}; 2279 glScale $self->{w}, $self->{h};
2149 2280
2150 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
2152 2283
2284 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2286 }
2156 2287
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2290
… …
2166 # draw handle 2297 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2298 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2299
2169 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
2170} 2301}
2302
2303#############################################################################
2304
2305package CFClient::UI::ValSlider;
2306
2307our @ISA = CFClient::UI::HBox::;
2308
2309sub new {
2310 my ($class, %arg) = @_;
2311
2312 my $range = delete $arg{range};
2313
2314 my $self = $class->SUPER::new (
2315 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2316 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2317 to_value => sub { shift },
2318 from_value => sub { shift },
2319 %arg,
2320 );
2321
2322 $self->{slider}->connect (changed => sub {
2323 my ($self, $value) = @_;
2324 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2325 $self->{parent}->emit (changed => $value);
2326 });
2327
2328# $self->{entry}->connect (changed => sub {
2329# my ($self, $value) = @_;
2330# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2331# $self->{parent}->emit (changed => $value);
2332# });
2333
2334 $self->add ($self->{slider}, $self->{entry});
2335
2336 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2337
2338 $self
2339}
2340
2341sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) }
2171 2343
2172############################################################################# 2344#############################################################################
2173 2345
2174package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
2175 2347
… …
2205 2377
2206 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2379 $self->reflow;
2208} 2380}
2209 2381
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 { 2382sub size_allocate {
2230 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2231 2384
2232 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2233 2388
2234 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2392
2238 $self->reflow; 2393 $self->reflow;
2239} 2394}
2240 2395
2396sub text_size {
2397 my ($self, $text, $indent) = @_;
2398
2399 my $layout = $self->{layout};
2400
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent);
2403 $layout->set_markup ($text);
2404
2405 $layout->size
2406}
2407
2408sub reflow {
2409 my ($self) = @_;
2410
2411 $self->{need_reflow}++;
2412 $self->update;
2413}
2414
2415sub set_offset {
2416 my ($self, $offset) = @_;
2417
2418 # todo: base offset on lines or so, not on pixels
2419 $self->{children}[1]->set_value ($offset);
2420}
2421
2422sub clear {
2423 my ($self) = @_;
2424
2425 $self->{par} = [];
2426 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428}
2429
2241sub add_paragraph { 2430sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
2243 2432
2244 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
2245 2434 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
2249 2438
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2440}
2255 2441
2256sub update { 2442sub update {
2257 my ($self) = @_; 2443 my ($self) = @_;
2258 2444
… …
2261 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2262 2448
2263 delete $self->{texture}; 2449 delete $self->{texture};
2264 2450
2265 $ROOT->on_post_alloc ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2266 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2455 my $height = 0;
2268 2456
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2270 for @{$self->{par}}; 2461 for (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2463 $layout->set_width ($W - $_->[3]);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3];
2467 $_->[1] = $h;
2468 }
2469
2470 $height += $_->[1];
2471 }
2271 2472
2272 $self->{height} = $height; 2473 $self->{height} = $height;
2273 2474
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2476
2276 delete $self->{texture}; 2477 delete $self->{texture};
2277 } 2478 }
2278 2479
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2282 2483
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]; 2484 my $top = int $self->{children}[1]{range}[0];
2287 2485
2288 my $y0 = $top; 2486 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2487 my $y1 = $top + $H;
2290 2488
2291 my $y = 0; 2489 my $y = 0;
2292 2490
2293 my $layout = $self->{layout}; 2491 my $layout = $self->{layout};
2294 2492
2295 $layout->set_font ($self->{font}) if $self->{font}; 2493 $layout->set_font ($self->{font}) if $self->{font};
2296 2494
2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498
2297 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2500 my $h = $par->[1];
2299 2501
2300 if ($y0 < $y + $h && $y < $y1) { 2502 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2303 2506
2304 my ($W, $H) = $layout->size; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2508
2509 glRasterPos $par->[3], $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2511 }
2307 2512
2308 $y += $h; 2513 $y += $h;
2309 } 2514 }
2310 2515
2311 glDisable GL_TEXTURE_2D; 2516 glDisable GL_BLEND;
2312 }; 2517 };
2313 }); 2518 });
2314} 2519}
2315 2520
2316sub _draw { 2521sub _draw {
2317 my ($self) = @_; 2522 my ($self) = @_;
2318 2523
2319 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2526 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2324 2529
2325 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2326 2531
2327} 2532}
… …
2376 2581
2377sub new { 2582sub new {
2378 my $class = shift; 2583 my $class = shift;
2379 2584
2380 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2381 state => 0, 2586 state => 0,
2382 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2383 @_ 2588 @_
2384 ); 2589 );
2385 2590
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2591 $self
2392} 2592}
2393 2593
2394sub toggle_flopper { 2594sub toggle_flopper {
2395 my ($self) = @_; 2595 my ($self) = @_;
2396 2596
2397 # TODO: use animation 2597 $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} 2598}
2409 2599
2410############################################################################# 2600#############################################################################
2411 2601
2412package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2426 2616
2427sub set_tooltip_from { 2617sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2618 my ($self, $widget) = @_;
2429 2619
2430 $self->add (new CFClient::UI::Label 2620 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2621 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2623 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2624 fg => [0, 0, 0, 1],
2625 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2626 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2627 );
2437} 2628}
2438 2629
2439sub size_request { 2630sub size_request {
2440 my ($self) = @_; 2631 my ($self) = @_;
… …
2443 2634
2444 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2445} 2636}
2446 2637
2447sub size_allocate { 2638sub size_allocate {
2448 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2449 2640
2641 return unless $changed;
2642
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2644}
2645
2646sub visibility_change {
2647 my ($self, $visible) = @_;
2648
2649 return unless $visible;
2650
2651 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner}
2653 or return;
2654
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH;
2659
2660 $self->move_abs ($x, $y);
2661 });
2451} 2662}
2452 2663
2453sub _draw { 2664sub _draw {
2454 my ($self) = @_; 2665 my ($self) = @_;
2455 2666
… …
2472 glVertex $w, $h; 2683 glVertex $w, $h;
2473 glVertex $w, 0; 2684 glVertex $w, 0;
2474 glEnd; 2685 glEnd;
2475 2686
2476 glTranslate 2 - 0.375, 2 - 0.375; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2688
2477 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2478} 2690}
2479 2691
2480############################################################################# 2692#############################################################################
2481 2693
… …
2486use CFClient::OpenGL; 2698use CFClient::OpenGL;
2487 2699
2488sub new { 2700sub new {
2489 my $class = shift; 2701 my $class = shift;
2490 2702
2491 $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2492 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2493 @_, 2706 @_,
2494 ) 2707 );
2708
2709 if ($self->{anim} && $self->{animspeed}) {
2710 Scalar::Util::weaken (my $widget = $self);
2711
2712 $self->{timer} = Event->timer (
2713 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2714 hard => 1,
2715 interval => $self->{animspeed},
2716 cb => sub {
2717 ++$widget->{frame};
2718 $widget->update;
2719 },
2720 );
2721 }
2722
2723 $self
2495} 2724}
2496 2725
2497sub size_request { 2726sub size_request {
2498 (32, 8) 2727 (32, 8)
2499} 2728}
2500 2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2501sub _draw { 2738sub _draw {
2502 my ($self) = @_; 2739 my ($self) = @_;
2503 2740
2504 return unless $::CONN;#d# manage and cache textures differently 2741 return unless $::CONN;
2742
2743 my $face;
2744
2745 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}];
2747
2748 $face = $anim->[ $self->{frame} % @$anim ]
2749 if $anim && @$anim;
2750 }
2751
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2753
2507 # TODO animation
2508 if ($tex) { 2754 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2755 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2757 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2514 } 2760 }
2515} 2761}
2516 2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2770}
2771
2517############################################################################# 2772#############################################################################
2518 2773
2519package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2520 2775
2521our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFClient::UI::ScrolledWindow::;
2522 2777
2523sub new { 2778sub new {
2524 my $class = shift; 2779 my $class = shift;
2525 2780
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 ( 2781 my $self = $class->SUPER::new (
2550 can_hover => 1, 2782 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 @_, 2783 @_,
2609 ); 2784 );
2610 2785
2611 $self 2786 $self
2612} 2787}
… …
2622 or ($a->{name} cmp $b->{name}) 2797 or ($a->{name} cmp $b->{name})
2623 } @$items; 2798 } @$items;
2624 2799
2625 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2626 2801
2802 my $row = 0;
2627 for my $item (@items) { 2803 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2 2804 CFClient::Item::update_widgets $item;
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631 2805
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2633 } 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2634 2809
2635 $self->{scrolled}->add (@items); 2810 $row++;
2636 2811 }
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} 2812}
2644 2813
2645############################################################################# 2814#############################################################################
2646 2815
2647package CFClient::UI::Menu; 2816package CFClient::UI::Menu;
… …
2682 2851
2683# popup given the event (must be a mouse button down event currently) 2852# popup given the event (must be a mouse button down event currently)
2684sub popup { 2853sub popup {
2685 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2686 2855
2687 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2688 2857
2689 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self; 2859 $GRAB = $self;
2691 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2692 2861
… …
2707 2876
2708 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB; 2878 undef $GRAB;
2710 $self->hide; 2879 $self->hide;
2711 2880
2712 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2714 } 2883 }
2715} 2884}
2716 2885
2717############################################################################# 2886#############################################################################
… …
2752 # TODO: doesn't handle markup well (read as: at all) 2921 # TODO: doesn't handle markup well (read as: at all)
2753 my $short = $item->{count} > 1 2922 my $short = $item->{count} > 1
2754 ? "<b>$item->{count} ×</b> $item->{text}" 2923 ? "<b>$item->{count} ×</b> $item->{text}"
2755 : $item->{text}; 2924 : $item->{text};
2756 2925
2757 my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759 for ($short) { 2926 for ($short) {
2760 s/^\s+//; 2927 s/^\s+//;
2761 s/\s+/ /g; 2928 s/\s+/ /g;
2762 my $len = int 40 / $fontsize;
2763 substr $_, $len, length, "…" if $len < length;
2764 } 2929 }
2765 2930
2766 new CFClient::UI::Label 2931 new CFClient::UI::Label
2767 markup => $short, 2932 markup => $short,
2768 tooltip => $item->{tooltip}, 2933 tooltip => $item->{tooltip},
2769 tooltip_font => $::FONT_PROP, 2934 tooltip_font => $::FONT_PROP,
2770 tooltip_width => 0.67, 2935 tooltip_width => 0.67,
2771 fontsize => $fontsize, 2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2772 fg => $item->{fg}, 2938 fg => $item->{fg},
2773 can_events => 1, 2939 can_events => 1,
2774 can_hover => 1 2940 can_hover => 1
2775 }; 2941 };
2776 } 2942 }
… …
2782sub add { 2948sub add {
2783 my ($self, $text, %arg) = @_; 2949 my ($self, $text, %arg) = @_;
2784 2950
2785 $text =~ s/^\s+//; 2951 $text =~ s/^\s+//;
2786 $text =~ s/\s+$//; 2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2787 2955
2788 my $timeout = time + ((delete $arg{timeout}) || 60); 2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2789 2957
2790 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2791 2959
… …
2813 } 2981 }
2814 2982
2815 $self->reorder; 2983 $self->reorder;
2816} 2984}
2817 2985
2986sub reconfigure {
2987 my ($self) = @_;
2988
2989 delete $_->{label}
2990 for values %{ $self->{item} || {} };
2991
2992 $self->reorder;
2993 $self->SUPER::reconfigure;
2994}
2995
2818############################################################################# 2996#############################################################################
2819 2997
2820package CFClient::UI::Root; 2998package CFClient::UI::Root;
2821 2999
2822our @ISA = CFClient::UI::Container::; 3000our @ISA = CFClient::UI::Container::;
… …
2824use CFClient::OpenGL; 3002use CFClient::OpenGL;
2825 3003
2826sub new { 3004sub new {
2827 my $class = shift; 3005 my $class = shift;
2828 3006
2829 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3008 visible => 1,
2830 @_, 3009 @_,
2831 ) 3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
2832} 3015}
2833 3016
2834sub configure { 3017sub configure {
2835 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
2836 3019
2837 $self->{w} = $w; 3020 $self->{w} = $w;
2838 $self->{h} = $h; 3021 $self->{h} = $h;
2839} 3022}
2840 3023
2841sub check_size { 3024sub reconfigure {
2842 my ($self) = @_; 3025 my ($self) = @_;
2843 3026
3027 $self->SUPER::reconfigure;
3028
2844 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
2845 if $self->{w}; 3030 if $self->{w};
2846} 3031}
2847 3032
2848sub size_request { 3033sub size_request {
2849 my ($self) = @_; 3034 my ($self) = @_;
2850 3035
2851 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
2852} 3037}
2853 3038
3039sub _to_pixel {
3040 my ($coord, $size, $max) = @_;
3041
3042 $coord =
3043 $coord eq "center" ? ($max - $size) * 0.5
3044 : $coord eq "max" ? $max
3045 : $coord;
3046
3047 $coord = 0 if $coord < 0;
3048 $coord = $max - $size if $coord > $max - $size;
3049
3050 int $coord + 0.5
3051}
3052
2854sub size_allocate { 3053sub size_allocate {
2855 my ($self, $w, $h) = @_; 3054 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 3055
2863 for my $child ($self->children) { 3056 for my $child ($self->children) {
2864 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2865 3058
2866 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
2867 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
2868 3061
2869 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
2870 if exists $child->{req_y}; 3063 $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 3064
2875 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
2876 } 3066 }
2877} 3067}
2878 3068
… …
2889} 3079}
2890 3080
2891sub update { 3081sub update {
2892 my ($self) = @_; 3082 my ($self) = @_;
2893 3083
2894 $self->check_size;
2895 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
2896} 3085}
2897 3086
2898sub add { 3087sub add {
2899 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
2900 3089
2901 for my $child (@children) {
2902 $child->{toplevel} = 1; 3090 $_->{is_toplevel} = 1
2903 3091 for @children;
2904 # integerise window positions
2905 $child->{x} = int $child->{x};
2906 $child->{y} = int $child->{y};
2907 }
2908 3092
2909 $self->SUPER::add (@children); 3093 $self->SUPER::add (@children);
3094}
3095
3096sub remove {
3097 my ($self, @children) = @_;
3098
3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
2910} 3109}
2911 3110
2912sub on_refresh { 3111sub on_refresh {
2913 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2914 3113
… …
2927 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
2928 $_->() 3127 $_->()
2929 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
2930 } 3129 }
2931 3130
2932 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
2933 my @queue = ([], []); 3132 my @queue;
2934 3133
2935 for (;;) { 3134 while () {
2936 if ($self->{check_size}) { 3135 if ($self->{realloc}) {
2937 # heuristic: check containers last 3136 #TODO use array-of-depth approach
2938 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
2939 for values %{delete $self->{check_size}} 3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{realloc}};
2940 } 3140 }
2941 3141
2942 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
2943 3143
3144 $widget->{visible} or last; # do not resize invisible widgets
3145
2944 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
2945 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(force_w force_h)}
2946 : $widget->size_request; 3148 : $widget->size_request;
2947 3149
2948 if (delete $widget->{force_alloc} 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
2949 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3151
2950 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 $w = $min_size if $w < $min_size;
2951 3153 $h = $min_size if $h < $min_size;
3154
2952 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
2953 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
2954 3157
2955 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2956 3159
2957 $widget->{parent}->check_size 3160 push @queue, $widget->{parent}
2958 if $widget->{parent}; 3161 if $widget->{parent};
2959 }
2960 } 3162 }
2961 } 3163 }
2962 3164
2963 while ($self->{size_alloc}) { 3165 while (my $size_alloc = delete $self->{size_alloc}) {
2964 for (values %{delete $self->{size_alloc}}) { 3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2965 my ($widget, $w, $h) = @$_; 3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
2966 3174
2967 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
2968 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
2969 3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
2970 $widget->{w} = $w; 3183 $widget->{w} = $w;
2971 $widget->{h} = $h; 3184 $widget->{h} = $h;
2972 $widget->size_allocate ($w, $h); 3185
2973 $widget->emit (size_allocate => $w, $h); 3186 $widget->emit (size_allocate => $w, $h, $changed);
2974 } 3187 }
2975 } 3188 }
2976 3189
2977 while ($self->{post_alloc_hook}) { 3190 while ($self->{post_alloc_hook}) {
2978 $_->() 3191 $_->()
… …
2983 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2984 glClear GL_COLOR_BUFFER_BIT; 3197 glClear GL_COLOR_BUFFER_BIT;
2985 3198
2986 glMatrixMode GL_PROJECTION; 3199 glMatrixMode GL_PROJECTION;
2987 glLoadIdentity; 3200 glLoadIdentity;
2988 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2989 glMatrixMode GL_MODELVIEW; 3202 glMatrixMode GL_MODELVIEW;
2990 glLoadIdentity; 3203 glLoadIdentity;
2991 3204
2992 $self->_draw; 3205 $self->_draw;
2993} 3206}
… …
2995############################################################################# 3208#############################################################################
2996 3209
2997package CFClient::UI; 3210package CFClient::UI;
2998 3211
2999$ROOT = new CFClient::UI::Root; 3212$ROOT = new CFClient::UI::Root;
3000$TOOLTIP = new CFClient::UI::Tooltip; 3213$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3001 3214
30021 32151
3003 3216

Diff Legend

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