ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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