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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.260 by elmex, Tue May 30 14:35:09 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
18 43
19sub check_tooltip { 44sub check_tooltip {
20 if (!$GRAB) { 45 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
23 48
24 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
25 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
26 53
27 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
28 55
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 57
31 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 59 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
50 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
51} 69}
52 70
53# class methods for events 71# class methods for events
54sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 74 if $FOCUS;
57} 75}
58 76
59sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 79 if $FOCUS;
62} 80}
63 81
64sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
… …
74 check_tooltip; 92 check_tooltip;
75 } 93 }
76 94
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 96
79 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 99}
84 100
85sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
86 my ($ev) = @_; 102 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
88 104
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 106
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 108
93 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 111
98 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 114 $grab->update if $grab;
101 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 132
119 check_tooltip; 133 check_tooltip;
120 } 134 }
121 135
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 137 if $HOVER;
126} 138}
127 139
128# convert position array to integers 140# convert position array to integers
129sub harmonize { 141sub harmonize {
130 my ($vals) = @_; 142 my ($vals) = @_;
… …
136 $rem += $_ - $i; 148 $rem += $_ - $i;
137 $_ = $i; 149 $_ = $i;
138 } 150 }
139} 151}
140 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
141# call when resolution changes etc. 169# call when resolution changes etc.
142sub rescale_widgets { 170sub rescale_widgets {
143 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
144 172
145 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
155 } 188 }
156
157 $widget->reconfigure;
158 } 189 }
190
191 reconfigure_widgets;
159} 192}
160 193
161############################################################################# 194#############################################################################
162 195
163package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
168 201
169sub new { 202sub new {
170 my $class = shift; 203 my $class = shift;
171 204
172 my $self = bless { 205 my $self = bless {
173 x => 0, 206 x => "center",
174 y => 0, 207 y => "center",
175 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
176 can_events => 1, 211 can_events => 1,
177 @_ 212 @_
178 }, $class; 213 }, $class;
179 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
180 for (keys %$self) { 217 for (keys %$self) {
181 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
183 } 220 }
184 } 221 }
185 222
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
187 234
188 $self 235 $self
189} 236}
190 237
191sub destroy { 238sub destroy {
… …
201 return if $self->{parent}; 248 return if $self->{parent};
202 249
203 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
204} 251}
205 252
206sub hide { 253sub set_visible {
207 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
208 277
209 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
211 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
212 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
213 if $self->{parent}; 312 if $self->{parent};
214} 313}
215 314
216sub move { 315sub move_abs {
217 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
218 317
219 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
222 321
223 $self->update; 322 $self->update;
224} 323}
225 324
226sub set_size { 325sub set_size {
227 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
228 327
229 $self->{user_w} = $w; 328 $self->{force_w} = $w;
230 $self->{user_h} = $h; 329 $self->{force_h} = $h;
231 330
232 $self->check_size; 331 $self->realloc;
233} 332}
234 333
235sub size_request { 334sub size_request {
236 require Carp; 335 require Carp;
237 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
239 338
240sub configure { 339sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
242 341
243 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
246 347
247 # use alignment to adjust x, y 348 # use alignment to adjust x, y
248 349
249 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 352 }
254 353
255 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 355 $self->{x} = $x;
257 $self->{y} = $y; 356 $self->{y} = $y;
258 $self->update; 357 $self->update;
259 } 358 }
260 359
261 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
263 } 367 }
264} 368}
265 369
266sub size_allocate { 370sub size_allocate {
267 # nothing to be done 371 # nothing to be done
268} 372}
269 373
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 374sub children {
278} 375}
279 376
280sub set_max_size { 377sub set_max_size {
281 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 382}
286 383
287sub set_tooltip { 384sub set_tooltip {
288 my ($self, $tooltip) = @_; 385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
289 391
290 $self->{tooltip} = $tooltip; 392 $self->{tooltip} = $tooltip;
291 393
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 395 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 417 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
317 419
318 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
319 421
320 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
321 423
322 $focus->update if $focus; 424 $focus->update if $focus;
323 $FOCUS->update; 425 $FOCUS->update;
324} 426}
325 427
… …
328 430
329 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
330 432
331 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
332 434
333 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
334 436
335 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
336} 441}
337 442
338sub mouse_motion { } 443sub mouse_motion { }
339sub button_up { } 444sub button_up { }
340sub key_down { } 445sub key_down { }
341sub key_up { } 446sub key_up { }
342 447
343sub button_down { 448sub button_down {
344 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
345 450
346 $self->focus_in; 451 $self->focus_in;
… …
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
353sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
354 529
355sub draw { 530sub draw {
356 my ($self) = @_; 531 my ($self) = @_;
357 532
358 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
375 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
376 glEnd; 551 glEnd;
377 glDisable GL_BLEND; 552 glDisable GL_BLEND;
378 } 553 }
379 554
380 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
381 glPushMatrix; 556 glPushMatrix;
382 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 560 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
389 glEnd; 564 glEnd;
390 glPopMatrix; 565 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 567 }
393} 568}
394 569
395sub _draw { 570sub _draw {
396 my ($self) = @_; 571 my ($self) = @_;
397 572
398 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 574}
448 575
449sub DESTROY { 576sub DESTROY {
450 my ($self) = @_; 577 my ($self) = @_;
451 578
… …
509 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
511} 638}
512 639
513sub size_request { 640sub size_request {
514 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
515} 644}
516 645
517sub draw { } 646sub draw { }
518 647
519############################################################################# 648#############################################################################
… …
548 $self->{children} = [ 677 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
551 ]; 680 ];
552 681
553 $self->check_size (1); 682 $self->realloc;
554 $self->update;
555} 683}
556 684
557sub children { 685sub children {
558 @{ $_[0]{children} } 686 @{ $_[0]{children} }
559} 687}
… …
564 delete $child->{parent}; 692 delete $child->{parent};
565 $child->hide; 693 $child->hide;
566 694
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 696
569 $self->check_size; 697 $self->realloc;
570 $self->update;
571} 698}
572 699
573sub clear { 700sub clear {
574 my ($self) = @_; 701 my ($self) = @_;
575 702
… …
579 for (@$children) { 706 for (@$children) {
580 delete $_->{parent}; 707 delete $_->{parent};
581 $_->hide; 708 $_->hide;
582 } 709 }
583 710
584 $self->check_size; 711 $self->realloc;
585 $self->update;
586} 712}
587 713
588sub find_widget { 714sub find_widget {
589 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
590 716
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
691 817
692 $self->_render; 818 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 819 };
701} 820}
702 821
703sub _draw { 822sub _draw {
704 my ($self) = @_; 823 my ($self) = @_;
… …
708 my $tex = $self->{texture} 827 my $tex = $self->{texture}
709 or return; 828 or return;
710 829
711 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
714 833
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 835
717 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
718} 837}
… …
721 840
722package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
723 842
724our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
725 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
726sub size_request { 855sub size_request {
727 my ($self) = @_; 856 my ($self) = @_;
728 857
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 859
732 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
733} 864}
734 865
735sub size_allocate { 866sub size_allocate {
736 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
737 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
738 $self->update; 875 $self->update;
739} 876}
740 877
741sub set_offset { 878sub set_offset {
742 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
793 my $class = shift; 930 my $class = shift;
794 931
795 my $self; 932 my $self;
796 933
797 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
798 vertical => 1, 935 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 937 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
802 }, 939 },
803 ; 940 ;
804 941
805 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 944 slider => $slider,
808 @_, 945 @_,
809 ); 946 );
810 947
811 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
814 951
815 $self 952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 972}
817 973
818#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 975# update viewport offset on scroll
820 976
… …
864 1020
865our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
866 1022
867use CFClient::OpenGL; 1023use CFClient::OpenGL;
868 1024
869my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1032
873sub new { 1033sub new {
874 my $class = shift; 1034 my $class = shift;
875 1035
876 # TODO: user_x, user_y, overwrite moveto?
877
878 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1039 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
884 @_ 1043 @_
885 ); 1044 );
886 1045
887 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 1047 align => 0,
… …
941 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
942 1101
943 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
945 1104
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1110 };
951 1111
952 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1116 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
958 1118
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
960 1120
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1122 };
964 } 1123 }
965} 1124}
966 1125
967sub button_up { 1126sub button_up {
… …
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1146
988 my $border = $self->border; 1147 my $border = $self->border;
989 1148
990 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1154
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
998 1157
999 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1163 }
1010 1164
1011 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1012 1166
… …
1028sub new { 1182sub new {
1029 my $class = shift; 1183 my $class = shift;
1030 1184
1031 $class->SUPER::new ( 1185 $class->SUPER::new (
1032 col_expand => [], 1186 col_expand => [],
1033 @_ 1187 @_,
1034 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1193}
1036 1194
1037sub add { 1195sub add {
1038 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1039 1197
1040 $child->set_parent ($self); 1198 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1042 1200
1043 $child->check_size; 1201 $self->realloc;
1044} 1202}
1045 1203
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1205sub clear {
1052 my ($self) = @_; 1206 my ($self) = @_;
1053 1207
1054 my @children = $self->children; 1208 my @children = $self->children;
1055 delete $self->{children}; 1209 delete $self->{children};
… …
1057 for (@children) { 1211 for (@children) {
1058 delete $_->{parent}; 1212 delete $_->{parent};
1059 $_->hide; 1213 $_->hide;
1060 } 1214 }
1061 1215
1062 $self->update; 1216 $self->realloc;
1063} 1217}
1064 1218
1065sub get_wh { 1219sub get_wh {
1066 my ($self) = @_; 1220 my ($self) = @_;
1067 1221
… …
1098sub size_allocate { 1252sub size_allocate {
1099 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1100 1254
1101 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1102 1256
1103 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1105 1259
1106 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1317 }
1164} 1318}
1165 1319
1166############################################################################# 1320#############################################################################
1167 1321
1168package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1323
1172our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1173 1325
1174sub size_request { 1326sub size_request {
1175 my ($self) = @_; 1327 my ($self) = @_;
1176 1328
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1178 1330 ? (
1179 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1333 )
1182 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1183} 1338}
1184 1339
1185sub size_allocate { 1340sub size_allocate {
1186 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1187 1342
1188 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1344 my $children = $self->{children};
1191 1345
1192 my @h = map $_->{req_w}, @$children; 1346 my @req;
1193 1347
1194 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1195 1349 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1364 }
1210 } 1365 }
1211 1366
1212 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1213 1368
1214 my $y = 0; 1369 my $pos = 0;
1215 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1373
1220 $y += $h; 1374 $pos += $alloc;
1221 } 1375 }
1222 1376
1223 1 1377 1
1224} 1378}
1225 1379
1226############################################################################# 1380#############################################################################
1227 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1228package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1229 1398
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1233 1400
1234sub size_request { 1401sub new {
1235 my ($self) = @_; 1402 my $class = shift;
1236 1403
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1238 1405 vertical => 1,
1239 ( 1406 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1407 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1408}
1283 1409
1284############################################################################# 1410#############################################################################
1285 1411
1286package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1297 #bg => none 1423 #bg => none
1298 #active_bg => none 1424 #active_bg => none
1299 #font => default_font 1425 #font => default_font
1300 #text => initial text 1426 #text => initial text
1301 #markup => initial narkup 1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1303 fontsize => 1, 1431 fontsize => 1,
1304 align => -1, 1432 align => -1,
1305 valign => -1, 1433 valign => -1,
1306 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1307 can_events => 0, 1436 can_events => 0,
1308 %arg 1437 %arg
1309 ); 1438 );
1310 1439
1311 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1348 1477
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1351 1480
1481 $self->realloc;
1352 $self->update; 1482 $self->update;
1353 $self->check_size;
1354} 1483}
1355 1484
1356sub set_markup { 1485sub set_markup {
1357 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1358 1487
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1492
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1366 1495
1496 $self->realloc;
1367 $self->update; 1497 $self->update;
1368 $self->check_size;
1369} 1498}
1370 1499
1371sub size_request { 1500sub size_request {
1372 my ($self) = @_; 1501 my ($self) = @_;
1373 1502
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1508
1378 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1379 1510
1380 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1385 1516
1386 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1388 } 1519 }
1389 1520
1390 ( 1521 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1522}
1395 1523
1396sub size_allocate { 1524sub size_allocate {
1397 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1398 1526
… …
1403 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1404 1532
1405 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1534 delete $self->{texture};
1407 1535
1408 $self->update; 1536 $self->realloc;
1409 $self->check_size;
1410} 1537}
1411 1538
1412sub _draw { 1539sub _draw {
1413 my ($self) = @_; 1540 my ($self) = @_;
1414 1541
… …
1416 1543
1417 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1545 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1551
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1553
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1428 1557
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1432 1561
1433 $tex 1562 $tex
1434 }; 1563 };
1435 1564
… …
1464 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1465 can_hover => 1, 1594 can_hover => 1,
1466 can_focus => 1, 1595 can_focus => 1,
1467 valign => 0, 1596 valign => 0,
1468 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1469 @_ 1599 @_
1470 ) 1600 )
1471} 1601}
1472 1602
1473sub _set_text { 1603sub _set_text {
… …
1483 $self->{text} = $text; 1613 $self->{text} = $text;
1484 1614
1485 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1487 1617
1488 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1489} 1619}
1490 1620
1491sub set_text { 1621sub set_text {
1492 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1493 1623
1494 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1625 $self->_set_text ($text);
1496 $self->update; 1626
1497 $self->check_size; 1627 $self->realloc;
1498} 1628}
1499 1629
1500sub get_text { 1630sub get_text {
1501 $_[0]{text} 1631 $_[0]{text}
1502} 1632}
… …
1505 my ($self) = @_; 1635 my ($self) = @_;
1506 1636
1507 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1508 1638
1509 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1640}
1517 1641
1518sub key_down { 1642sub key_down {
1519 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1520 1644
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1663 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1664 $self->_emit ('escape');
1541 } elsif ($uni) { 1665 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1667 }
1544 1668
1545 $self->_set_text ($text); 1669 $self->_set_text ($text);
1546 $self->update; 1670
1547 $self->check_size; 1671 $self->realloc;
1548} 1672}
1549 1673
1550sub focus_in { 1674sub focus_in {
1551 my ($self) = @_; 1675 my ($self) = @_;
1552 1676
… …
1632 if ($sym == 13) { 1756 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1638 $self->update; 1762 $self->update;
1639 1763
1640 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1679 1803
1680sub new { 1804sub new {
1681 my $class = shift; 1805 my $class = shift;
1682 1806
1683 $class->SUPER::new ( 1807 $class->SUPER::new (
1684 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1685 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1687 can_hover => 1, 1812 can_hover => 1,
1688 align => 0, 1813 align => 0,
1689 valign => 0, 1814 valign => 0,
1690 can_events => 1, 1815 can_events => 1,
1691 @_ 1816 @_
1692 ) 1817 )
1693} 1818}
1694 1819
1820sub activate { }
1821
1695sub button_up { 1822sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1697 1824
1825 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1828}
1703 1829
1704sub _draw { 1830sub _draw {
1705 my ($self) = @_; 1831 my ($self) = @_;
1706 1832
… …
1735 1861
1736sub new { 1862sub new {
1737 my $class = shift; 1863 my $class = shift;
1738 1864
1739 $class->SUPER::new ( 1865 $class->SUPER::new (
1740 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1741 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1872 state => 0,
… …
1749} 1876}
1750 1877
1751sub size_request { 1878sub size_request {
1752 my ($self) = @_; 1879 my ($self) = @_;
1753 1880
1754 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1755} 1882}
1756 1883
1757sub button_down { 1884sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1759 1886
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1764 } 1891 }
1765} 1892}
1766 1893
1767sub _draw { 1894sub _draw {
1768 my ($self) = @_; 1895 my ($self) = @_;
1769 1896
1770 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1771 1898
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1900
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1904
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1906
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1908
… …
2043 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2051 vertical => 0, 2180 vertical => 0,
2052 can_hover => 1, 2181 can_hover => 1,
2053 inner_pad => .05, 2182 inner_pad => 0.02,
2054 @_ 2183 @_
2055 ); 2184 );
2056 2185
2057 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2058 $self->update; 2187 $self->update;
2059 2188
2060 $self 2189 $self
2061} 2190}
2062 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2063sub set_value { 2203sub set_value {
2064 my ($self, $value) = @_; 2204 my ($self, $value) = @_;
2065 2205
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2207
2068 $hi = $lo + 1 if $hi <= $lo; 2208 $hi = $lo + 1 if $hi <= $lo;
2069 2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2070 $value = $lo if $value < $lo; 2212 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2213 $value = $hi - $page if $value > $hi - $page;
2072 2214
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2216 if $unit;
2075 2217
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2219
2080 if ($value != $old_value) { 2220 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2221 $self->_emit (changed => $value);
2082 $self->update; 2222 $self->update;
2083 } 2223 }
2084} 2224}
2085 2225
2086sub size_request { 2226sub size_request {
2087 my ($self) = @_; 2227 my ($self) = @_;
2088 2228
2089 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2230}
2094 2231
2095sub button_down { 2232sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2097 2234
2098 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
2099 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2100} 2240}
2101 2241
2102sub mouse_motion { 2242sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2247
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2249
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2251
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2253 }
2114} 2254}
2115 2255
2116sub update { 2256sub update {
2117 my ($self) = @_; 2257 my ($self) = @_;
2118 2258
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2260 $self->set_value ($self->{range}[0]);
2121 2261
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2123 2264
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2266
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2269
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2270 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2271 $value = $value * $self->{scale} + $self->{offset};
2130 2272
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2274 $self->{knob_w} = $knob_w;
2138 }); 2275 });
2139 2276
2140 $self->SUPER::update; 2277 $self->SUPER::update;
2141} 2278}
2142 2279
… …
2148 glScale $self->{w}, $self->{h}; 2285 glScale $self->{w}, $self->{h};
2149 2286
2150 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2152 2289
2290 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2292 }
2156 2293
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2296
… …
2166 # draw handle 2303 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2305
2169 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2170} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2171 2349
2172############################################################################# 2350#############################################################################
2173 2351
2174package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2175 2353
… …
2205 2383
2206 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2385 $self->reflow;
2208} 2386}
2209 2387
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2388sub size_allocate {
2230 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2231 2390
2232 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2233 2392
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2396
2238 $self->reflow; 2397 $self->reflow;
2239} 2398}
2240 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2241sub add_paragraph { 2434sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2243 2436
2244 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2245 2438 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2249 2442
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2444}
2255 2445
2256sub update { 2446sub update {
2257 my ($self) = @_; 2447 my ($self) = @_;
2258 2448
… …
2261 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2262 2452
2263 delete $self->{texture}; 2453 delete $self->{texture};
2264 2454
2265 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2266 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2459 my $height = 0;
2268 2460
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2270 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2271 2476
2272 $self->{height} = $height; 2477 $self->{height} = $height;
2273 2478
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2480
2276 delete $self->{texture}; 2481 delete $self->{texture};
2277 } 2482 }
2278 2483
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2282 2487
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2287 2489
2288 my $y0 = $top; 2490 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2290 2492
2291 my $y = 0; 2493 my $y = 0;
2292 2494
2293 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2294 2496
2295 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2296 2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2297 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2504 my $h = $par->[1];
2299 2505
2300 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2303 2510
2304 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2512
2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2515 }
2307 2516
2308 $y += $h; 2517 $y += $h;
2309 } 2518 }
2310 2519
2311 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2312 }; 2521 };
2313 }); 2522 });
2314} 2523}
2315 2524
2316sub _draw { 2525sub _draw {
2317 my ($self) = @_; 2526 my ($self) = @_;
2318 2527
2319 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2324 2533
2325 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2326 2535
2327} 2536}
… …
2376 2585
2377sub new { 2586sub new {
2378 my $class = shift; 2587 my $class = shift;
2379 2588
2380 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2381 state => 0, 2590 state => 0,
2382 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2383 @_ 2592 @_
2384 ); 2593 );
2385 2594
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2595 $self
2392} 2596}
2393 2597
2394sub toggle_flopper { 2598sub toggle_flopper {
2395 my ($self) = @_; 2599 my ($self) = @_;
2396 2600
2397 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2602}
2409 2603
2410############################################################################# 2604#############################################################################
2411 2605
2412package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2425} 2619}
2426 2620
2427sub set_tooltip_from { 2621sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2429 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2430 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2636 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2640 );
2437} 2641}
2438 2642
2439sub size_request { 2643sub size_request {
2440 my ($self) = @_; 2644 my ($self) = @_;
… …
2446 2650
2447sub size_allocate { 2651sub size_allocate {
2448 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2449 2653
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2451} 2673}
2452 2674
2453sub _draw { 2675sub _draw {
2454 my ($self) = @_; 2676 my ($self) = @_;
2455 2677
… …
2472 glVertex $w, $h; 2694 glVertex $w, $h;
2473 glVertex $w, 0; 2695 glVertex $w, 0;
2474 glEnd; 2696 glEnd;
2475 2697
2476 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2477 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2478} 2701}
2479 2702
2480############################################################################# 2703#############################################################################
2481 2704
… …
2486use CFClient::OpenGL; 2709use CFClient::OpenGL;
2487 2710
2488sub new { 2711sub new {
2489 my $class = shift; 2712 my $class = shift;
2490 2713
2491 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2492 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2493 @_, 2717 @_,
2494 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2495} 2735}
2496 2736
2497sub size_request { 2737sub size_request {
2498 (32, 8) 2738 (32, 8)
2499} 2739}
2500 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2501sub _draw { 2749sub _draw {
2502 my ($self) = @_; 2750 my ($self) = @_;
2503 2751
2504 return unless $::CONN;#d# manage and cache textures differently 2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2764
2507 # TODO animation
2508 if ($tex) { 2765 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2514 } 2771 }
2515} 2772}
2516 2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2517############################################################################# 2783#############################################################################
2518 2784
2519package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2520 2786
2521our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548 2788
2549sub new { 2789sub new {
2550 my $class = shift; 2790 my $class = shift;
2551 2791
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2559 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_, 2794 @_,
2634 ); 2795 );
2635 2796
2636 $self 2797 $self
2637} 2798}
… …
2647 or ($a->{name} cmp $b->{name}) 2808 or ($a->{name} cmp $b->{name})
2648 } @$items; 2809 } @$items;
2649 2810
2650 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2651 2812
2813 my $row = 0;
2652 for my $item (@items) { 2814 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2815 CFClient::Item::update_widgets $item;
2654 $item->update_item ();
2655 }
2656 2816
2657 $self->{scrolled}->add (@items); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2658 2820
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2660} 2822 }
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665} 2823}
2666 2824
2667############################################################################# 2825#############################################################################
2668 2826
2669package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2704 2862
2705# popup given the event (must be a mouse button down event currently) 2863# popup given the event (must be a mouse button down event currently)
2706sub popup { 2864sub popup {
2707 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2708 2866
2709 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2710 2868
2711 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2870 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2714 2872
2715 $self->show; 2873 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2875}
2718 2876
2719sub mouse_motion { 2877sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2721 2879
… …
2729 2887
2730 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2889 undef $GRAB;
2732 $self->hide; 2890 $self->hide;
2733 2891
2734 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2736 } 2894 }
2737} 2895}
2738 2896
2739############################################################################# 2897#############################################################################
… …
2774 # TODO: doesn't handle markup well (read as: at all) 2932 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 2933 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 2934 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 2935 : $item->{text};
2778 2936
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 2937 for ($short) {
2782 s/^\s+//; 2938 s/^\s+//;
2783 s/\s+/ /g; 2939 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 2940 }
2787 2941
2788 new CFClient::UI::Label 2942 new CFClient::UI::Label
2789 markup => $short, 2943 markup => $short,
2790 tooltip => $item->{tooltip}, 2944 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 2945 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 2946 tooltip_width => 0.67,
2793 fontsize => $fontsize, 2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 2949 fg => $item->{fg},
2795 can_events => 1, 2950 can_events => 1,
2796 can_hover => 1 2951 can_hover => 1
2797 }; 2952 };
2798 } 2953 }
… …
2804sub add { 2959sub add {
2805 my ($self, $text, %arg) = @_; 2960 my ($self, $text, %arg) = @_;
2806 2961
2807 $text =~ s/^\s+//; 2962 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2809 2966
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2968
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2970
… …
2835 } 2992 }
2836 2993
2837 $self->reorder; 2994 $self->reorder;
2838} 2995}
2839 2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
2840############################################################################# 3007#############################################################################
2841 3008
2842package CFClient::UI::Root; 3009package CFClient::UI::Root;
2843 3010
2844our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
… …
2846use CFClient::OpenGL; 3013use CFClient::OpenGL;
2847 3014
2848sub new { 3015sub new {
2849 my $class = shift; 3016 my $class = shift;
2850 3017
2851 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2852 @_, 3020 @_,
2853 ) 3021 );
2854}
2855 3022
2856sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2857 my ($self, $x, $y, $w, $h) = @_;
2858 3024
2859 $self->{w} = $w; 3025 $self
2860 $self->{h} = $h;
2861}
2862
2863sub check_size {
2864 my ($self) = @_;
2865
2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2868} 3026}
2869 3027
2870sub size_request { 3028sub size_request {
2871 my ($self) = @_; 3029 my ($self) = @_;
2872 3030
2873 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2874} 3046}
2875 3047
2876sub size_allocate { 3048sub size_allocate {
2877 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2878 3050
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 3051 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3053
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2890 3056
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3059
2897 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2898 } 3061 }
2899} 3062}
2900 3063
… …
2911} 3074}
2912 3075
2913sub update { 3076sub update {
2914 my ($self) = @_; 3077 my ($self) = @_;
2915 3078
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
2918} 3080}
2919 3081
2920sub add { 3082sub add {
2921 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
2922 3084
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3085 $_->{is_toplevel} = 1
2925 3086 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3087
2931 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2932} 3104}
2933 3105
2934sub on_refresh { 3106sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2936 3108
… …
2949 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2950 $_->() 3122 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
2952 } 3124 }
2953 3125
2954 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
2955 my @queue = ([], []); 3127 my @queue;
2956 3128
2957 for (;;) { 3129 while () {
2958 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
2959 # heuristic: check containers last 3131 #TODO use array-of-depth approach
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
2961 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
2962 } 3137 }
2963 3138
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
2965 3140
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
2967 ? @$widget{qw(user_w user_h)} 3142
2968 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
2969 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
2970 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
2976 3155
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
2978 3157
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
2981 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
2982 } 3167 }
2983 } 3168 }
2984 3169
2985 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3178
2989 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
2991 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
2992 $widget->{w} = $w; 3186 $widget->{w} = $w;
2993 $widget->{h} = $h; 3187 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3188
2995 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
2996 } 3191 }
2997 } 3192 }
2998 3193
2999 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3000 $_->() 3195 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3002 } 3197 }
3003 3198
3199
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3007 3203
3008 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3205 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3208 glLoadIdentity;
3013 3209
3014 $self->_draw; 3210 $self->_draw;
3015} 3211}
3016 3212
3017############################################################################# 3213#############################################################################
3018 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording",
3239 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped."
3242 ."To bind the action you have to click on the 'Bind' button",
3243 on_activate => sub {
3244 unless ($self->{recording}) {
3245 $self->start;
3246 } else {
3247 $self->stop;
3248 }
3249 });
3250
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3252
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button
3255 text => "ok",
3256 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub {
3258 $self->hide;
3259 $self->commit;
3260 });
3261
3262 $hb->add (new CFClient::UI::Button
3263 text => "cancel",
3264 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->{binding_cancel}->()
3268 if $self->{binding_cancel};
3269 });
3270
3271 $self->update_binding_widgets;
3272
3273 $self
3274}
3275
3276sub commit {
3277 my ($self) = @_;
3278 my ($mod, $sym, $cmds) = $self->get_binding;
3279 if ($sym != 0 && @$cmds > 0) {
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change};
3284 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!");
3286 $self->{binding_cancel}->()
3287 if $self->{binding_cancel};
3288 }
3289}
3290
3291sub start {
3292 my ($self) = @_;
3293
3294 $self->{rec_btn}->set_text ("stop recording");
3295 $self->{recording} = 1;
3296 $self->clear_command_list;
3297 $::CONN->start_record if $::CONN;
3298}
3299
3300sub stop {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("start recording");
3304 $self->{recording} = 0;
3305
3306 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec);
3310}
3311
3312sub ask_for_bind {
3313 my ($self, $commit) = @_;
3314
3315 CFClient::Binder::open_binding_dialog (sub {
3316 my ($mod, $sym) = @_;
3317 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3318 $self->update_binding_widgets;
3319 $self->commit if $commit;
3320 });
3321}
3322
3323sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325
3326 $self->clear_command_list;
3327 $self->{recording} = 0;
3328 $self->{rec_btn}->set_text ("start recording");
3329
3330 $self->{binding} = [$mod, $sym];
3331 $self->{commands} = $cmds;
3332
3333 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb;
3335
3336 $self->update_binding_widgets;
3337}
3338
3339sub update_binding_widgets {
3340 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding;
3342 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3343 $self->set_command_list ($cmds);
3344}
3345
3346sub get_binding {
3347 my ($self) = @_;
3348 return (
3349 $self->{binding}->[0],
3350 $self->{binding}->[1],
3351 [ grep { defined $_ } @{$self->{commands}} ]
3352 );
3353}
3354
3355sub clear_command_list {
3356 my ($self) = @_;
3357 $self->{cmdbox}->clear ();
3358}
3359
3360sub set_command_list {
3361 my ($self, $cmds) = @_;
3362
3363 $self->{cmdbox}->clear ();
3364 $self->{commands} = $cmds;
3365
3366 my $idx = 0;
3367
3368 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370
3371 my $i = $idx;
3372 $hb->add (new CFClient::UI::Button
3373 text => "delete",
3374 tooltip => "Deletes the action from the record",
3375 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef;
3378 });
3379
3380 $hb->add (new CFClient::UI::Label text => $_);
3381
3382 $idx++
3383 }
3384}
3385
3386
3387#############################################################################
3388
3019package CFClient::UI; 3389package CFClient::UI;
3020 3390
3021$ROOT = new CFClient::UI::Root; 3391$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3392$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3393
30241 33941
3025 3395

Diff Legend

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