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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 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) = @_;
282 371
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 372 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 373 delete $self->{max_h}; $self->{max_h} = $h if $h;
374}
375
376sub set_tooltip {
377 my ($self, $tooltip) = @_;
378
379 $tooltip =~ s/^\s+//;
380 $tooltip =~ s/\s+$//;
381
382 return if $self->{tooltip} eq $tooltip;
383
384 $self->{tooltip} = $tooltip;
385
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip;
389 }
285} 390}
286 391
287# translate global coordinates to local coordinate system 392# translate global coordinates to local coordinate system
288sub coord2local { 393sub coord2local {
289 my ($self, $x, $y) = @_; 394 my ($self, $x, $y) = @_;
… …
304 return if $FOCUS == $self; 409 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 410 return unless $self->{can_focus};
306 411
307 my $focus = $FOCUS; $FOCUS = $self; 412 my $focus = $FOCUS; $FOCUS = $self;
308 413
309 $self->emit (focus_in => $focus); 414 $self->_emit (focus_in => $focus);
310 415
311 $focus->update if $focus; 416 $focus->update if $focus;
312 $FOCUS->update; 417 $FOCUS->update;
313} 418}
314 419
… …
317 422
318 return unless $FOCUS == $self; 423 return unless $FOCUS == $self;
319 424
320 my $focus = $FOCUS; undef $FOCUS; 425 my $focus = $FOCUS; undef $FOCUS;
321 426
322 $self->emit (focus_out => $focus); 427 $self->_emit (focus_out => $focus);
323 428
324 $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;
325} 433}
326 434
327sub mouse_motion { } 435sub mouse_motion { }
328sub button_up { } 436sub button_up { }
329sub key_down { } 437sub key_down { }
330sub key_up { } 438sub key_up { }
331 439
332sub button_down { 440sub button_down {
333 my ($self, $ev, $x, $y) = @_; 441 my ($self, $ev, $x, $y) = @_;
334 442
335 $self->focus_in; 443 $self->focus_in;
… …
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
342sub 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}
343 521
344sub draw { 522sub draw {
345 my ($self) = @_; 523 my ($self) = @_;
346 524
347 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
364 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
365 glEnd; 543 glEnd;
366 glDisable GL_BLEND; 544 glDisable GL_BLEND;
367 } 545 }
368 546
369 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
370 glPushMatrix; 548 glPushMatrix;
371 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 552 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 553 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 554 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 555 glVertex 0 , $self->{h} - 1;
378 glEnd; 556 glEnd;
379 glPopMatrix; 557 glPopMatrix;
380 #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;
381 } 559 }
382} 560}
… …
385 my ($self) = @_; 563 my ($self) = @_;
386 564
387 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
388} 566}
389 567
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436}
437
438sub DESTROY { 568sub DESTROY {
439 my ($self) = @_; 569 my ($self) = @_;
440 570
441 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
442 #$self->deactivate; 572 #$self->deactivate;
… …
455 my $class = shift; 585 my $class = shift;
456 586
457 # range [value, low, high, page] 587 # range [value, low, high, page]
458 588
459 $class->SUPER::new ( 589 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 590 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 591 #active_bg => [1, 1, 1, 0.5],
462 @_ 592 @_
463 ) 593 )
464} 594}
465 595
466sub _draw { 596sub _draw {
467 my ($self) = @_; 597 my ($self) = @_;
468 598
599 my $color = $FOCUS == $self && $self->{active_bg}
600 ? $self->{active_bg}
601 : $self->{bg};
602
603 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 604 my ($w, $h) = @$self{qw(w h)};
470 605
471 glEnable GL_BLEND; 606 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 608 glColor @$color;
474 609
475 glBegin GL_QUADS; 610 glBegin GL_QUADS;
476 glVertex 0 , 0; 611 glVertex 0 , 0;
477 glVertex 0 , $h; 612 glVertex 0 , $h;
478 glVertex $w, $h; 613 glVertex $w, $h;
479 glVertex $w, 0; 614 glVertex $w, 0;
480 glEnd; 615 glEnd;
481 616
482 glDisable GL_BLEND; 617 glDisable GL_BLEND;
618 }
483} 619}
484 620
485############################################################################# 621#############################################################################
486 622
487package CFClient::UI::Empty; 623package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
494} 630}
495 631
496sub size_request { 632sub size_request {
497 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
498} 636}
499 637
500sub draw { } 638sub draw { }
501 639
502############################################################################# 640#############################################################################
… …
531 $self->{children} = [ 669 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
534 ]; 672 ];
535 673
536 $self->check_size (1); 674 $self->realloc;
537 $self->update;
538} 675}
539 676
540sub children { 677sub children {
541 @{ $_[0]{children} } 678 @{ $_[0]{children} }
542} 679}
… …
547 delete $child->{parent}; 684 delete $child->{parent};
548 $child->hide; 685 $child->hide;
549 686
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 688
552 $self->check_size; 689 $self->realloc;
553 $self->update;
554} 690}
555 691
556sub clear { 692sub clear {
557 my ($self) = @_; 693 my ($self) = @_;
558 694
… …
562 for (@$children) { 698 for (@$children) {
563 delete $_->{parent}; 699 delete $_->{parent};
564 $_->hide; 700 $_->hide;
565 } 701 }
566 702
567 $self->check_size; 703 $self->realloc;
568 $self->update;
569} 704}
570 705
571sub find_widget { 706sub find_widget {
572 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
573 708
… …
626sub size_request { 761sub size_request {
627 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
628} 763}
629 764
630sub size_allocate { 765sub size_allocate {
631 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
632 767
633 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
634} 769}
635 770
636############################################################################# 771#############################################################################
… …
653 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
654 $self->SUPER::update; 789 $self->SUPER::update;
655} 790}
656 791
657sub size_allocate { 792sub size_allocate {
658 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
659 794
660 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
661 $self->update; 796 $self->update
797 if $changed;
662} 798}
663 799
664sub _render { 800sub _render {
665 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
666} 802}
… …
671 $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 {
672 glClearColor 0, 0, 0, 0; 808 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
674 810
675 $self->_render; 811 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 812 };
684} 813}
685 814
686sub _draw { 815sub _draw {
687 my ($self) = @_; 816 my ($self) = @_;
… …
691 my $tex = $self->{texture} 820 my $tex = $self->{texture}
692 or return; 821 or return;
693 822
694 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 825 glColor 1, 1, 1, 1;
697 826
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 828
700 glDisable GL_TEXTURE_2D; 829 glDisable GL_TEXTURE_2D;
701} 830}
… …
704 833
705package CFClient::UI::ViewPort; 834package CFClient::UI::ViewPort;
706 835
707our @ISA = CFClient::UI::Window::; 836our @ISA = CFClient::UI::Window::;
708 837
838sub new {
839 my $class = shift;
840
841 $class->SUPER::new (
842 scroll_x => 0,
843 scroll_y => 1,
844 @_,
845 )
846}
847
709sub size_request { 848sub size_request {
710 my ($self) = @_; 849 my ($self) = @_;
711 850
712 @$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)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 852
715 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
716} 857}
717 858
718sub size_allocate { 859sub size_allocate {
719 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
720 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);
721 $self->update; 866 $self->update;
722} 867}
723 868
724sub set_offset { 869sub set_offset {
725 my ($self, $x, $y) = @_; 870 my ($self, $x, $y) = @_;
… …
776 my $class = shift; 921 my $class = shift;
777 922
778 my $self; 923 my $self;
779 924
780 my $slider = new CFClient::UI::Slider 925 my $slider = new CFClient::UI::Slider
781 vertical => 1, 926 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 927 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 928 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 929 $self->{vp}->set_offset (0, $_[1]);
785 }, 930 },
786 ; 931 ;
787 932
788 $self = $class->SUPER::new ( 933 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 934 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 935 slider => $slider,
791 @_, 936 @_,
792 ); 937 );
793 938
794 $self->{vp}->add ($self->{scrolled}); 939 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 940 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 941 $self->add ($self->{slider});
797 942
798 $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]);
799} 963}
800 964
801#TODO# update range on size_allocate depending on child 965#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 966# update viewport offset on scroll
803 967
… …
847 1011
848our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
849 1013
850use CFClient::OpenGL; 1014use CFClient::OpenGL;
851 1015
852my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 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);
855 1023
856sub new { 1024sub new {
857 my $class = shift; 1025 my $class = shift;
858 1026
859 # TODO: user_x, user_y, overwrite moveto?
860
861 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1030 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1031 can_events => 1,
867 @_ 1032 @_
868 ); 1033 );
869 1034
870 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 1036 align => 0,
… …
890 $h + $self->border * 2, 1055 $h + $self->border * 2,
891 ) 1056 )
892} 1057}
893 1058
894sub size_allocate { 1059sub size_allocate {
895 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
896 1063
897 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
899 1066
900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
924 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
925 1092
926 my $dx = $ev->{x} - $ox; 1093 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1094 my $dy = $ev->{y} - $oy;
928 1095
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098
1099 $self->realloc;
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size;
933 }; 1101 };
934 1102
935 } elsif ($lr ^ $td) { 1103 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1107 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
941 1109
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
943 1111
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update;
946 }; 1113 };
947 } 1114 }
948} 1115}
949 1116
950sub button_up { 1117sub button_up {
… …
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1137
971 my $border = $self->border; 1138 my $border = $self->border;
972 1139
973 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1145
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1147 glColor @{ $self->{bg} };
981 1148
982 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
1150 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1151 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1152 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1154 }
993 1155
994 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
995 1157
… …
1011sub new { 1173sub new {
1012 my $class = shift; 1174 my $class = shift;
1013 1175
1014 $class->SUPER::new ( 1176 $class->SUPER::new (
1015 col_expand => [], 1177 col_expand => [],
1016 @_ 1178 @_,
1017 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1184}
1019 1185
1020sub add { 1186sub add {
1021 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1022 1188
1023 $child->set_parent ($self); 1189 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1025 1191
1026 $child->check_size; 1192 $self->realloc;
1027} 1193}
1028 1194
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
1034sub clear { 1196sub clear {
1035 my ($self) = @_; 1197 my ($self) = @_;
1036 1198
1037 my @children = $self->children; 1199 my @children = $self->children;
1038 delete $self->{children}; 1200 delete $self->{children};
… …
1040 for (@children) { 1202 for (@children) {
1041 delete $_->{parent}; 1203 delete $_->{parent};
1042 $_->hide; 1204 $_->hide;
1043 } 1205 }
1044 1206
1045 $self->update; 1207 $self->realloc;
1046} 1208}
1047 1209
1048sub get_wh { 1210sub get_wh {
1049 my ($self) = @_; 1211 my ($self) = @_;
1050 1212
… …
1077 (sum @$hs), 1239 (sum @$hs),
1078 ) 1240 )
1079} 1241}
1080 1242
1081sub size_allocate { 1243sub size_allocate {
1082 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
1083 1245
1084 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
1085 1247
1086 my $req_w = sum @$ws; 1248 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1249 my $req_h = (sum @$hs) || 1;
1088 1250
1089 # TODO: nicer code && do row_expand 1251 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1252 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1253 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1254 my $col_expand = (sum @col_expand) || 1;
… …
1146 } 1308 }
1147} 1309}
1148 1310
1149############################################################################# 1311#############################################################################
1150 1312
1313package CFClient::UI::Box;
1314
1315our @ISA = CFClient::UI::Container::;
1316
1317sub size_request {
1318 my ($self) = @_;
1319
1320 $self->{vertical}
1321 ? (
1322 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1324 )
1325 : (
1326 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 )
1329}
1330
1331sub size_allocate {
1332 my ($self, $w, $h, $changed) = @_;
1333
1334 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children};
1336
1337 my @req;
1338
1339 if ($self->{homogeneous}) {
1340 @req = ($space / (@$children || 1)) x @$children;
1341 } else {
1342 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1343 my $req = List::Util::sum @req;
1344
1345 if ($req > $space) {
1346 # ah well, not enough space
1347 $_ *= $space / $req for @req;
1348 } else {
1349 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1350
1351 $space = ($space - $req) / $expand; # remaining space to give away
1352
1353 $req[$_] += $space * $children->[$_]{expand}
1354 for 0 .. $#$children;
1355 }
1356 }
1357
1358 CFClient::UI::harmonize \@req;
1359
1360 my $pos = 0;
1361 for (0 .. $#$children) {
1362 my $alloc = $req[$_];
1363 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1364
1365 $pos += $alloc;
1366 }
1367
1368 1
1369}
1370
1371#############################################################################
1372
1151package CFClient::UI::HBox; 1373package CFClient::UI::HBox;
1152 1374
1153# TODO: wrap into common Box base class
1154
1155our @ISA = CFClient::UI::Container::; 1375our @ISA = CFClient::UI::Box::;
1156 1376
1157sub size_request { 1377sub new {
1158 my ($self) = @_; 1378 my $class = shift;
1159 1379
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1380 $class->SUPER::new (
1161 1381 vertical => 0,
1162 ( 1382 @_,
1163 (List::Util::sum map $_->[0], @alloc),
1164 (List::Util::max map $_->[1], @alloc),
1165 ) 1383 )
1166} 1384}
1167 1385
1168sub size_allocate {
1169 my ($self, $w, $h) = @_;
1170
1171 ($h, $w) = ($w, $h);
1172
1173 my $children = $self->{children};
1174
1175 my @h = map $_->{req_w}, @$children;
1176
1177 my $req_h = List::Util::sum @h;
1178
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children;
1184 $exp ||= 1;
1185
1186 for (0 .. $#$children) {
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 }
1193 }
1194
1195 CFClient::UI::harmonize \@h;
1196
1197 my $y = 0;
1198 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_];
1201 $child->configure ($y, 0, $h, $w);
1202
1203 $y += $h;
1204 }
1205
1206 1
1207}
1208
1209############################################################################# 1386#############################################################################
1210 1387
1211package CFClient::UI::VBox; 1388package CFClient::UI::VBox;
1212 1389
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Box::;
1216 1391
1217sub size_request { 1392sub new {
1218 my ($self) = @_; 1393 my $class = shift;
1219 1394
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $class->SUPER::new (
1221 1396 vertical => 1,
1222 ( 1397 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1398 )
1226} 1399}
1227 1400
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1401#############################################################################
1268 1402
1269package CFClient::UI::Label; 1403package CFClient::UI::Label;
1270 1404
1271our @ISA = CFClient::UI::Base::; 1405our @ISA = CFClient::UI::DrawBG::;
1272 1406
1273use CFClient::OpenGL; 1407use CFClient::OpenGL;
1274 1408
1275sub new { 1409sub new {
1276 my ($class, %arg) = @_; 1410 my ($class, %arg) = @_;
1277 1411
1278 my $self = $class->SUPER::new ( 1412 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1413 fg => [1, 1, 1],
1414 #bg => none
1415 #active_bg => none
1280 #font => default_font 1416 #font => default_font
1281 #text => initial text 1417 #text => initial text
1282 #markup => initial narkup 1418 #markup => initial narkup
1419 #max_w => maximum pixel width
1420 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1421 layout => (new CFClient::Layout),
1284 fontsize => 1, 1422 fontsize => 1,
1285 align => -1, 1423 align => -1,
1286 valign => -1, 1424 valign => -1,
1287 padding => 2, 1425 padding => 2,
… …
1302 } 1440 }
1303 1441
1304 $self 1442 $self
1305} 1443}
1306 1444
1307sub escape { 1445sub escape($) {
1308 local $_ = $_[1]; 1446 local $_ = $_[0];
1309 1447
1310 s/&/&amp;/g; 1448 s/&/&amp;/g;
1311 s/>/&gt;/g; 1449 s/>/&gt;/g;
1312 s/</&lt;/g; 1450 s/</&lt;/g;
1313 1451
1314 $_[1] 1452 $_
1315} 1453}
1316 1454
1317sub update { 1455sub update {
1318 my ($self) = @_; 1456 my ($self) = @_;
1319 1457
… …
1328 $self->{text} = "T$text"; 1466 $self->{text} = "T$text";
1329 1467
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1332 1470
1471 $self->realloc;
1333 $self->update; 1472 $self->update;
1334 $self->check_size;
1335} 1473}
1336 1474
1337sub set_markup { 1475sub set_markup {
1338 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1339 1477
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1481 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1482
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1347 1485
1486 $self->realloc;
1348 $self->update; 1487 $self->update;
1349 $self->check_size;
1350} 1488}
1351 1489
1352sub size_request { 1490sub size_request {
1353 my ($self) = @_; 1491 my ($self) = @_;
1354 1492
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1494 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1498
1359 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1360 1500
1361 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1373 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1374 ) 1514 )
1375} 1515}
1376 1516
1377sub size_allocate { 1517sub size_allocate {
1378 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1379 1519
1380 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1381} 1522}
1382 1523
1383sub set_fontsize { 1524sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1385 1526
1386 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1528 delete $self->{texture};
1388 1529
1389 $self->update; 1530 $self->realloc;
1390 $self->check_size;
1391} 1531}
1392 1532
1393sub _draw { 1533sub _draw {
1394 my ($self) = @_; 1534 my ($self) = @_;
1535
1536 $self->SUPER::_draw; # draw background, if applicable
1395 1537
1396 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1539 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1541 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1545
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1546 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1547
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1443 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1444 can_hover => 1, 1588 can_hover => 1,
1445 can_focus => 1, 1589 can_focus => 1,
1446 valign => 0, 1590 valign => 0,
1447 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1448 @_ 1593 @_
1449 ) 1594 )
1450} 1595}
1451 1596
1452sub _set_text { 1597sub _set_text {
… …
1462 $self->{text} = $text; 1607 $self->{text} = $text;
1463 1608
1464 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1466 1611
1467 $self->emit (changed => $self->{text}); 1612 $self->_emit (changed => $self->{text});
1468} 1613}
1469 1614
1470sub set_text { 1615sub set_text {
1471 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1472 1617
1473 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1619 $self->_set_text ($text);
1475 $self->update; 1620
1476 $self->check_size; 1621 $self->realloc;
1477} 1622}
1478 1623
1479sub get_text { 1624sub get_text {
1480 $_[0]{text} 1625 $_[0]{text}
1481} 1626}
… …
1484 my ($self) = @_; 1629 my ($self) = @_;
1485 1630
1486 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1487 1632
1488 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1634}
1496 1635
1497sub key_down { 1636sub key_down {
1498 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1499 1638
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1657 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1658 $self->_emit ('escape');
1520 } elsif ($uni) { 1659 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1661 }
1523 1662
1524 $self->_set_text ($text); 1663 $self->_set_text ($text);
1525 $self->update; 1664
1526 $self->check_size; 1665 $self->realloc;
1527} 1666}
1528 1667
1529sub focus_in { 1668sub focus_in {
1530 my ($self) = @_; 1669 my ($self) = @_;
1531 1670
… …
1611 if ($sym == 13) { 1750 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1751 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1752 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1753 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1754 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1755 $self->_emit (activate => $txt);
1617 $self->update; 1756 $self->update;
1618 1757
1619 } elsif ($sym == CFClient::SDLK_UP) { 1758 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1759 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1760 $self->{history_saveback} = $self->get_text;
… …
1660 my $class = shift; 1799 my $class = shift;
1661 1800
1662 $class->SUPER::new ( 1801 $class->SUPER::new (
1663 padding => 4, 1802 padding => 4,
1664 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1667 can_hover => 1, 1805 can_hover => 1,
1668 align => 0, 1806 align => 0,
1669 valign => 0, 1807 valign => 0,
1670 can_events => 1, 1808 can_events => 1,
1671 @_ 1809 @_
1672 ) 1810 )
1673} 1811}
1674 1812
1813sub activate { }
1814
1675sub button_up { 1815sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1677 1817
1818 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1821}
1683 1822
1684sub _draw { 1823sub _draw {
1685 my ($self) = @_; 1824 my ($self) = @_;
1686 1825
… …
1718 1857
1719 $class->SUPER::new ( 1858 $class->SUPER::new (
1720 padding => 2, 1859 padding => 2,
1721 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1861 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1864 state => 0,
1724 can_hover => 1, 1865 can_hover => 1,
1725 @_ 1866 @_
1726 ) 1867 )
1727} 1868}
… …
1736 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1737 1878
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1742 } 1883 }
1743} 1884}
1744 1885
1745sub _draw { 1886sub _draw {
1746 my ($self) = @_; 1887 my ($self) = @_;
… …
2019 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2161 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2164 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2168 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2169 min_h => $::WIDTH / 80,
2027 vertical => 0, 2170 vertical => 0,
2028 can_hover => 1, 2171 can_hover => 1,
2029 inner_pad => .05, 2172 inner_pad => 0.02,
2030 @_ 2173 @_
2031 ); 2174 );
2032 2175
2033 $self->set_value ($self->{range}[0]); 2176 $self->set_value ($self->{range}[0]);
2034 $self->update; 2177 $self->update;
2035 2178
2036 $self 2179 $self
2037} 2180}
2038 2181
2182sub changed { }
2183
2184sub set_range {
2185 my ($self, $range) = @_;
2186
2187 ($range, $self->{range}) = ($self->{range}, $range);
2188
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}";
2191}
2192
2039sub set_value { 2193sub set_value {
2040 my ($self, $value) = @_; 2194 my ($self, $value) = @_;
2041 2195
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2196 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2197
2044 $hi = $lo + 1 if $hi <= $lo; 2198 $hi = $lo + 1 if $hi <= $lo;
2045 2199
2200 $page = $hi - $lo if $page > $hi - $lo;
2201
2046 $value = $lo if $value < $lo; 2202 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2203 $value = $hi - $page if $value > $hi - $page;
2048 2204
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2205 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2206 if $unit;
2051 2207
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2209
2056 if ($value != $old_value) { 2210 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2211 $self->_emit (changed => $value);
2058 $self->update; 2212 $self->update;
2059 } 2213 }
2060} 2214}
2061 2215
2062sub size_request { 2216sub size_request {
2063 my ($self) = @_; 2217 my ($self) = @_;
2064 2218
2065 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
2066 my $h = $self->{req_h};
2067
2068 $self->{vertical} ? ($h, $w) : ($w, $h)
2069} 2220}
2070 2221
2071sub button_down { 2222sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
2073 2224
2074 $self->SUPER::button_down ($ev, $x, $y); 2225 $self->SUPER::button_down ($ev, $x, $y);
2226
2227 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228
2075 $self->mouse_motion ($ev, $x, $y); 2229 $self->mouse_motion ($ev, $x, $y);
2076} 2230}
2077 2231
2078sub mouse_motion { 2232sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
… …
2081 if ($GRAB == $self) { 2235 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2236 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2237
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2238 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2239
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2240 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2241
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2242 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089 } 2243 }
2090} 2244}
2091 2245
2092sub update { 2246sub update {
2093 my ($self) = @_; 2247 my ($self) = @_;
2094 2248
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2249 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]); 2250 $self->set_value ($self->{range}[0]);
2097 2251
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2252 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100;
2099 2254
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2255 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2256
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2257 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2258 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2259
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2260 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2261 $value = $value * $self->{scale} + $self->{offset};
2106 2262
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2263 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2264 $self->{knob_w} = $knob_w;
2114 }); 2265 });
2115 2266
2116 $self->SUPER::update; 2267 $self->SUPER::update;
2117} 2268}
2118 2269
… …
2124 glScale $self->{w}, $self->{h}; 2275 glScale $self->{w}, $self->{h};
2125 2276
2126 if ($self->{vertical}) { 2277 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2278 # draw a vertical slider like a rotated horizontal slider
2128 2279
2280 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2281 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2282 }
2132 2283
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2284 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2285 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2286
… …
2142 # draw handle 2293 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2294 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2295
2145 glDisable GL_TEXTURE_2D; 2296 glDisable GL_TEXTURE_2D;
2146} 2297}
2298
2299#############################################################################
2300
2301package CFClient::UI::ValSlider;
2302
2303our @ISA = CFClient::UI::HBox::;
2304
2305sub new {
2306 my ($class, %arg) = @_;
2307
2308 my $range = delete $arg{range};
2309
2310 my $self = $class->SUPER::new (
2311 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2312 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2313 to_value => sub { shift },
2314 from_value => sub { shift },
2315 %arg,
2316 );
2317
2318 $self->{slider}->connect (changed => sub {
2319 my ($self, $value) = @_;
2320 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2321 $self->{parent}->emit (changed => $value);
2322 });
2323
2324# $self->{entry}->connect (changed => sub {
2325# my ($self, $value) = @_;
2326# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2327# $self->{parent}->emit (changed => $value);
2328# });
2329
2330 $self->add ($self->{slider}, $self->{entry});
2331
2332 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2333
2334 $self
2335}
2336
2337sub set_range { shift->{slider}->set_range (@_) }
2338sub set_value { shift->{slider}->set_value (@_) }
2147 2339
2148############################################################################# 2340#############################################################################
2149 2341
2150package CFClient::UI::TextView; 2342package CFClient::UI::TextView;
2151 2343
… …
2181 2373
2182 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2375 $self->reflow;
2184} 2376}
2185 2377
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2378sub size_allocate {
2206 my ($self, $w, $h) = @_; 2379 my ($self, $w, $h, $changed) = @_;
2207 2380
2208 $self->SUPER::size_allocate ($w, $h); 2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2209 2384
2210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2211 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2388
2214 $self->reflow; 2389 $self->reflow;
2215} 2390}
2216 2391
2392sub text_size {
2393 my ($self, $text, $indent) = @_;
2394
2395 my $layout = $self->{layout};
2396
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent);
2399 $layout->set_markup ($text);
2400
2401 $layout->size
2402}
2403
2404sub reflow {
2405 my ($self) = @_;
2406
2407 $self->{need_reflow}++;
2408 $self->update;
2409}
2410
2411sub set_offset {
2412 my ($self, $offset) = @_;
2413
2414 # todo: base offset on lines or so, not on pixels
2415 $self->{children}[1]->set_value ($offset);
2416}
2417
2418sub clear {
2419 my ($self) = @_;
2420
2421 $self->{par} = [];
2422 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424}
2425
2217sub add_paragraph { 2426sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2219 2428
2220 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2221 2430 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2225 2434
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2229 $self->{children}[1]->update;
2230} 2436}
2231 2437
2232sub update { 2438sub update {
2233 my ($self) = @_; 2439 my ($self) = @_;
2234 2440
… …
2237 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2238 2444
2239 delete $self->{texture}; 2445 delete $self->{texture};
2240 2446
2241 $ROOT->on_post_alloc ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2242 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2451 my $height = 0;
2244 2452
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2246 for @{$self->{par}}; 2457 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h;
2464 }
2465
2466 $height += $_->[1];
2467 }
2247 2468
2248 $self->{height} = $height; 2469 $self->{height} = $height;
2249 2470
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2472
2252 delete $self->{texture}; 2473 delete $self->{texture};
2253 } 2474 }
2254 2475
2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2256 glClearColor 0, 0, 0, 0; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2258 2479
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2480 my $top = int $self->{children}[1]{range}[0];
2263 2481
2264 my $y0 = $top; 2482 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2483 my $y1 = $top + $H;
2266 2484
2267 my $y = 0; 2485 my $y = 0;
2268 2486
2269 my $layout = $self->{layout}; 2487 my $layout = $self->{layout};
2270 2488
2271 $layout->set_font ($self->{font}) if $self->{font}; 2489 $layout->set_font ($self->{font}) if $self->{font};
2272 2490
2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494
2273 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2496 my $h = $par->[1];
2275 2497
2276 if ($y0 < $y + $h && $y < $y1) { 2498 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2279 2502
2280 my ($W, $H) = $layout->size; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2504
2505 glRasterPos $par->[3], $y - $y0;
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2507 }
2283 2508
2284 $y += $h; 2509 $y += $h;
2285 } 2510 }
2286 2511
2287 glDisable GL_TEXTURE_2D; 2512 glDisable GL_BLEND;
2288 }; 2513 };
2289 }); 2514 });
2290} 2515}
2291 2516
2292sub _draw { 2517sub _draw {
2293 my ($self) = @_; 2518 my ($self) = @_;
2294 2519
2295 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2522 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2300 2525
2301 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2302 2527
2303} 2528}
… …
2352 2577
2353sub new { 2578sub new {
2354 my $class = shift; 2579 my $class = shift;
2355 2580
2356 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2357 state => 0, 2582 state => 0,
2358 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2359 @_ 2584 @_
2360 ); 2585 );
2361 2586
2362 if ($self->{state}) {
2363 $self->{state} = 0;
2364 $self->toggle_flopper;
2365 }
2366
2367 $self 2587 $self
2368} 2588}
2369 2589
2370sub toggle_flopper { 2590sub toggle_flopper {
2371 my ($self) = @_; 2591 my ($self) = @_;
2372 2592
2373 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2374 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open");
2378 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close");
2381 }
2382
2383 $self->emit (changed => $self->{state});
2384} 2594}
2385 2595
2386############################################################################# 2596#############################################################################
2387 2597
2388package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2402 2612
2403sub set_tooltip_from { 2613sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2614 my ($self, $widget) = @_;
2405 2615
2406 $self->add (new CFClient::UI::Label 2616 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2617 markup => $widget->{tooltip},
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2619 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2620 fg => [0, 0, 0, 1],
2621 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2622 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2623 );
2413} 2624}
2414 2625
2415sub size_request { 2626sub size_request {
2416 my ($self) = @_; 2627 my ($self) = @_;
… …
2419 2630
2420 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2421} 2632}
2422 2633
2423sub size_allocate { 2634sub size_allocate {
2424 my ($self, $w, $h) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2425 2636
2637 return unless $changed;
2638
2426 $self->SUPER::size_allocate ($w - 4, $h - 4); 2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2640}
2641
2642sub visibility_change {
2643 my ($self, $visible) = @_;
2644
2645 return unless $visible;
2646
2647 $self->{root}->on_post_alloc ("move_$self" => sub {
2648 my $widget = $self->{owner}
2649 or return;
2650
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH;
2655
2656 $self->move_abs ($x, $y);
2657 });
2427} 2658}
2428 2659
2429sub _draw { 2660sub _draw {
2430 my ($self) = @_; 2661 my ($self) = @_;
2431 2662
… …
2448 glVertex $w, $h; 2679 glVertex $w, $h;
2449 glVertex $w, 0; 2680 glVertex $w, 0;
2450 glEnd; 2681 glEnd;
2451 2682
2452 glTranslate 2 - 0.375, 2 - 0.375; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2684
2453 $self->SUPER::_draw; 2685 $self->SUPER::_draw;
2454} 2686}
2455 2687
2456############################################################################# 2688#############################################################################
2457 2689
… …
2462use CFClient::OpenGL; 2694use CFClient::OpenGL;
2463 2695
2464sub new { 2696sub new {
2465 my $class = shift; 2697 my $class = shift;
2466 2698
2467 $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2468 aspect => 1, 2700 aspect => 1,
2701 can_events => 0,
2469 @_, 2702 @_,
2470 ) 2703 );
2704
2705 if ($self->{anim} && $self->{animspeed}) {
2706 Scalar::Util::weaken (my $widget = $self);
2707
2708 $self->{timer} = Event->timer (
2709 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2710 hard => 1,
2711 interval => $self->{animspeed},
2712 cb => sub {
2713 ++$widget->{frame};
2714 $widget->update;
2715 },
2716 );
2717 }
2718
2719 $self
2471} 2720}
2472 2721
2473sub size_request { 2722sub size_request {
2474 (32, 8) 2723 (32, 8)
2475} 2724}
2476 2725
2726sub update {
2727 my ($self) = @_;
2728
2729 return unless $self->{visible};
2730
2731 $self->SUPER::update;
2732}
2733
2477sub _draw { 2734sub _draw {
2478 my ($self) = @_; 2735 my ($self) = @_;
2479 2736
2480 return unless $::CONN;#d# manage and cache textures differently 2737 return unless $::CONN;
2738
2739 my $face;
2740
2741 if ($self->{frame}) {
2742 my $anim = $::CONN->{anim}[$self->{anim}];
2743
2744 $face = $anim->[ $self->{frame} % @$anim ]
2745 if $anim && @$anim;
2746 }
2747
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2749
2483 # TODO animation
2484 if ($tex) { 2750 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2751 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2753 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2755 glDisable GL_TEXTURE_2D;
2490 } 2756 }
2491} 2757}
2492 2758
2759sub DESTROY {
2760 my ($self) = @_;
2761
2762 $self->{timer}->cancel
2763 if $self->{timer};
2764
2765 $self->SUPER::DESTROY;
2766}
2767
2493############################################################################# 2768#############################################################################
2494 2769
2495package CFClient::UI::InventoryItem; 2770package CFClient::UI::Inventory;
2496 2771
2497our @ISA = CFClient::UI::HBox::; 2772our @ISA = CFClient::UI::ScrolledWindow::;
2498 2773
2499sub new { 2774sub new {
2500 my $class = shift; 2775 my $class = shift;
2501 2776
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
2526 can_hover => 1, 2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_, 2779 @_,
2585 ); 2780 );
2586 2781
2587 $self 2782 $self
2588} 2783}
… …
2598 or ($a->{name} cmp $b->{name}) 2793 or ($a->{name} cmp $b->{name})
2599 } @$items; 2794 } @$items;
2600 2795
2601 $self->{real_items} = \@items; 2796 $self->{real_items} = \@items;
2602 2797
2798 my $row = 0;
2603 for my $item (@items) { 2799 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2 2800 CFClient::Item::update_widgets $item;
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607 2801
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2609 } 2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2610 2805
2611 $self->{scrolled}->add (@items); 2806 $row++;
2612 2807 }
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619} 2808}
2620 2809
2621############################################################################# 2810#############################################################################
2622 2811
2623package CFClient::UI::Menu; 2812package CFClient::UI::Menu;
… …
2658 2847
2659# popup given the event (must be a mouse button down event currently) 2848# popup given the event (must be a mouse button down event currently)
2660sub popup { 2849sub popup {
2661 my ($self, $ev) = @_; 2850 my ($self, $ev) = @_;
2662 2851
2663 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2664 2853
2665 # maybe save $GRAB? must be careful about events... 2854 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2855 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2856 $self->{button} = $ev->{button};
2668 2857
… …
2683 2872
2684 if ($ev->{button} == $self->{button}) { 2873 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2874 undef $GRAB;
2686 $self->hide; 2875 $self->hide;
2687 2876
2688 $self->emit ("popdown"); 2877 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2878 $self->{hover}[1]->() if $self->{hover};
2690 } 2879 }
2691} 2880}
2692 2881
2693############################################################################# 2882#############################################################################
2694 2883
2695package CFClient::UI::Statusbox; 2884package CFClient::UI::Statusbox;
2696 2885
2697our @ISA = CFClient::UI::VBox::; 2886our @ISA = CFClient::UI::VBox::;
2887
2888sub new {
2889 my $class = shift;
2890
2891 $class->SUPER::new (
2892 fontsize => 0.8,
2893 @_,
2894 )
2895}
2698 2896
2699sub reorder { 2897sub reorder {
2700 my ($self) = @_; 2898 my ($self) = @_;
2701 my $NOW = time; 2899 my $NOW = time;
2702 2900
… …
2722 : $item->{text}; 2920 : $item->{text};
2723 2921
2724 for ($short) { 2922 for ($short) {
2725 s/^\s+//; 2923 s/^\s+//;
2726 s/\s+/ /g; 2924 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2925 }
2730 2926
2731 new CFClient::UI::Label 2927 new CFClient::UI::Label
2732 markup => $short, 2928 markup => $short,
2733 tooltip => $item->{tooltip}, 2929 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2930 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2931 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2932 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2934 fg => $item->{fg},
2738 can_events => 1, 2935 can_events => 1,
2739 can_hover => 1 2936 can_hover => 1
2740 }; 2937 };
2741 } 2938 }
… …
2747sub add { 2944sub add {
2748 my ($self, $text, %arg) = @_; 2945 my ($self, $text, %arg) = @_;
2749 2946
2750 $text =~ s/^\s+//; 2947 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 2948 $text =~ s/\s+$//;
2949
2950 return unless $text;
2752 2951
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 2952 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 2953
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 2955
… …
2768 $self->{item}{$group} = { 2967 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2968 id => ++$self->{id},
2770 text => $text, 2969 text => $text,
2771 timeout => $timeout, 2970 timeout => $timeout,
2772 tooltip => $text, 2971 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2972 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2973 pri => 0,
2776 count => 1, 2974 count => 1,
2777 %arg, 2975 %arg,
2778 }; 2976 };
2779 } 2977 }
2780 2978
2781 $self->reorder; 2979 $self->reorder;
2782} 2980}
2783 2981
2982sub reconfigure {
2983 my ($self) = @_;
2984
2985 delete $_->{label}
2986 for values %{ $self->{item} || {} };
2987
2988 $self->reorder;
2989 $self->SUPER::reconfigure;
2990}
2991
2784############################################################################# 2992#############################################################################
2785 2993
2786package CFClient::UI::Root; 2994package CFClient::UI::Root;
2787 2995
2788our @ISA = CFClient::UI::Container::; 2996our @ISA = CFClient::UI::Container::;
… …
2790use CFClient::OpenGL; 2998use CFClient::OpenGL;
2791 2999
2792sub new { 3000sub new {
2793 my $class = shift; 3001 my $class = shift;
2794 3002
2795 $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
3004 visible => 1,
2796 @_, 3005 @_,
2797 ) 3006 );
3007
3008 Scalar::Util::weaken ($self->{root} = $self);
3009
3010 $self
2798} 3011}
2799 3012
2800sub configure { 3013sub configure {
2801 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2802 3015
2803 $self->{w} = $w; 3016 $self->{w} = $w;
2804 $self->{h} = $h; 3017 $self->{h} = $h;
2805} 3018}
2806 3019
2807sub check_size { 3020sub reconfigure {
2808 my ($self) = @_; 3021 my ($self) = @_;
2809 3022
3023 $self->SUPER::reconfigure;
3024
2810 $self->size_allocate ($self->{w}, $self->{h}) 3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
2811 if $self->{w}; 3026 if $self->{w};
2812} 3027}
2813 3028
2814sub size_request { 3029sub size_request {
2815 my ($self) = @_; 3030 my ($self) = @_;
2816 3031
2817 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
2818} 3033}
2819 3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
3047}
3048
2820sub size_allocate { 3049sub size_allocate {
2821 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h, $changed) = @_;
2822
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828 3051
2829 for my $child ($self->children) { 3052 for my $child ($self->children) {
2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831 3054
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
2833 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
2834 3057
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
2836 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
2837
2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840 3060
2841 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2842 } 3062 }
2843} 3063}
2844 3064
… …
2855} 3075}
2856 3076
2857sub update { 3077sub update {
2858 my ($self) = @_; 3078 my ($self) = @_;
2859 3079
2860 $self->check_size;
2861 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
2862} 3081}
2863 3082
2864sub add { 3083sub add {
2865 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
2866 3085
2867 for my $child (@children) {
2868 $child->{toplevel} = 1; 3086 $_->{is_toplevel} = 1
2869 3087 for @children;
2870 # integerise window positions
2871 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y};
2873 }
2874 3088
2875 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3090}
3091
3092sub remove {
3093 my ($self, @children) = @_;
3094
3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3099
3100 while (@children) {
3101 my $w = pop @children;
3102 push @children, $w->children;
3103 $w->set_invisible;
3104 }
2876} 3105}
2877 3106
2878sub on_refresh { 3107sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2880 3109
… …
2893 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
2894 $_->() 3123 $_->()
2895 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
2896 } 3125 }
2897 3126
2898 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
2899 my @queue = ([], []); 3128 my @queue;
2900 3129
2901 for (;;) { 3130 while () {
2902 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
2903 # heuristic: check containers last 3132 #TODO use array-of-depth approach
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
2905 for values %{delete $self->{check_size}} 3134 @queue = sort { $a->{visible} <=> $b->{visible} }
3135 @queue, values %{delete $self->{realloc}};
2906 } 3136 }
2907 3137
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3138 my $widget = pop @queue || last;
2909 3139
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3140 $widget->{visible} or last; # do not resize invisible widgets
2911 ? @$widget{qw(user_w user_h)} 3141
2912 : $widget->size_request; 3142 my ($w, $h) = $widget->size_request;
2913 3143
2914 if (delete $widget->{force_alloc} 3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3145
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
2917 3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
2918 $widget->{req_w} = $w; 3152 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h; 3153 $widget->{req_h} = $h;
2920 3154
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3155 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2922 3156
2923 $widget->{parent}->check_size 3157 push @queue, $widget->{parent}
2924 if $widget->{parent}; 3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2925 }
2926 } 3159 }
2927 } 3160 }
2928 3161
2929 while ($self->{size_alloc}) { 3162 while (my $size_alloc = delete $self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) { 3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2931 my ($widget, $w, $h) = @$_; 3164 values %$size_alloc;
3165
3166 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last };
3168
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
2932 3171
2933 $w = 0 if $w < 0; 3172 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3173 $h = 0 if $h < 0;
2935 3174
3175 $w = int $w + 0.5;
3176 $h = int $h + 0.5;
3177
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3179
2936 $widget->{w} = $w; 3180 $widget->{w} = $w;
2937 $widget->{h} = $h; 3181 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h); 3182
2939 $widget->emit (size_allocate => $w, $h); 3183 $widget->emit (size_allocate => $w, $h, $changed);
2940 } 3184 }
2941 } 3185 }
2942 3186
2943 while ($self->{post_alloc_hook}) { 3187 while ($self->{post_alloc_hook}) {
2944 $_->() 3188 $_->()
… …
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2951 3195
2952 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3197 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3200 glLoadIdentity;
2957 3201
2958 $self->_draw; 3202 $self->_draw;
2959} 3203}
… …
2961############################################################################# 3205#############################################################################
2962 3206
2963package CFClient::UI; 3207package CFClient::UI;
2964 3208
2965$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3211
29681 32121
2969 3213

Diff Legend

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