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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 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 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 173 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 188 }
159
160 $widget->reconfigure;
161 } 189 }
190
191 reconfigure_widgets;
162} 192}
163 193
164############################################################################# 194#############################################################################
165 195
166package CFClient::UI::Base; 196package CFClient::UI::Base;
… …
171 201
172sub new { 202sub new {
173 my $class = shift; 203 my $class = shift;
174 204
175 my $self = bless { 205 my $self = bless {
176 x => 0, 206 x => "center",
177 y => 0, 207 y => "center",
178 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
179 can_events => 1, 211 can_events => 1,
180 @_ 212 @_
181 }, $class; 213 }, $class;
182 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
183 for (keys %$self) { 217 for (keys %$self) {
184 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
186 } 220 }
187 } 221 }
188 222
189 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 }
190 234
191 $self 235 $self
192} 236}
193 237
194sub destroy { 238sub destroy {
… …
204 return if $self->{parent}; 248 return if $self->{parent};
205 249
206 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
207} 251}
208 252
209sub hide { 253sub set_visible {
210 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};
211 277
212 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
216 if $self->{parent}; 312 if $self->{parent};
217} 313}
218 314
219sub move { 315sub move_abs {
220 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
221 317
222 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
225 321
226 $self->update; 322 $self->update;
227} 323}
228 324
229sub set_size { 325sub set_size {
230 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
231 327
232 $self->{user_w} = $w; 328 $self->{force_w} = $w;
233 $self->{user_h} = $h; 329 $self->{force_h} = $h;
234 330
235 $self->check_size; 331 $self->realloc;
236} 332}
237 333
238sub size_request { 334sub size_request {
239 require Carp; 335 require Carp;
240 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
242 338
243sub configure { 339sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
245 341
246 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
249 347
250 # use alignment to adjust x, y 348 # use alignment to adjust x, y
251 349
252 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 352 }
257 353
258 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 355 $self->{x} = $x;
260 $self->{y} = $y; 356 $self->{y} = $y;
261 $self->update; 357 $self->update;
262 } 358 }
263 359
264 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 367 }
267} 368}
268 369
269sub size_allocate { 370sub size_allocate {
270 # nothing to be done 371 # nothing to be done
271} 372}
272 373
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 374sub children {
281} 375}
282 376
283sub set_max_size { 377sub set_max_size {
284 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 382}
289 383
290sub set_tooltip { 384sub set_tooltip {
291 my ($self, $tooltip) = @_; 385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
292 391
293 $self->{tooltip} = $tooltip; 392 $self->{tooltip} = $tooltip;
294 393
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 395 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 417 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
320 419
321 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
322 421
323 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
324 423
325 $focus->update if $focus; 424 $focus->update if $focus;
326 $FOCUS->update; 425 $FOCUS->update;
327} 426}
328 427
… …
331 430
332 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
333 432
334 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
335 434
336 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
337 436
338 $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;
339} 441}
340 442
341sub mouse_motion { } 443sub mouse_motion { }
342sub button_up { } 444sub button_up { }
343sub key_down { } 445sub key_down { }
344sub key_up { } 446sub key_up { }
345 447
346sub button_down { 448sub button_down {
347 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
348 450
349 $self->focus_in; 451 $self->focus_in;
… …
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356sub 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}
357 529
358sub draw { 530sub draw {
359 my ($self) = @_; 531 my ($self) = @_;
360 532
361 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
378 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
379 glEnd; 551 glEnd;
380 glDisable GL_BLEND; 552 glDisable GL_BLEND;
381 } 553 }
382 554
383 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 556 glPushMatrix;
385 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 560 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
392 glEnd; 564 glEnd;
393 glPopMatrix; 565 glPopMatrix;
394 #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;
395 } 567 }
396} 568}
397 569
398sub _draw { 570sub _draw {
399 my ($self) = @_; 571 my ($self) = @_;
400 572
401 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 574}
451 575
452sub DESTROY { 576sub DESTROY {
453 my ($self) = @_; 577 my ($self) = @_;
454 578
… …
512 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
514} 638}
515 639
516sub size_request { 640sub size_request {
517 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
518} 644}
519 645
520sub draw { } 646sub draw { }
521 647
522############################################################################# 648#############################################################################
… …
551 $self->{children} = [ 677 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
554 ]; 680 ];
555 681
556 $self->check_size (1); 682 $self->realloc;
557 $self->update;
558} 683}
559 684
560sub children { 685sub children {
561 @{ $_[0]{children} } 686 @{ $_[0]{children} }
562} 687}
… …
567 delete $child->{parent}; 692 delete $child->{parent};
568 $child->hide; 693 $child->hide;
569 694
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 696
572 $self->check_size; 697 $self->realloc;
573 $self->update;
574} 698}
575 699
576sub clear { 700sub clear {
577 my ($self) = @_; 701 my ($self) = @_;
578 702
… …
582 for (@$children) { 706 for (@$children) {
583 delete $_->{parent}; 707 delete $_->{parent};
584 $_->hide; 708 $_->hide;
585 } 709 }
586 710
587 $self->check_size; 711 $self->realloc;
588 $self->update;
589} 712}
590 713
591sub find_widget { 714sub find_widget {
592 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
593 716
… …
691 $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 {
692 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
694 817
695 $self->_render; 818 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 819 };
704} 820}
705 821
706sub _draw { 822sub _draw {
707 my ($self) = @_; 823 my ($self) = @_;
… …
711 my $tex = $self->{texture} 827 my $tex = $self->{texture}
712 or return; 828 or return;
713 829
714 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
717 833
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 835
720 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
721} 837}
… …
724 840
725package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
726 842
727our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
728 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
729sub size_request { 855sub size_request {
730 my ($self) = @_; 856 my ($self) = @_;
731 857
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 859
735 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
736} 864}
737 865
738sub size_allocate { 866sub size_allocate {
739 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
740 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);
741 $self->update; 875 $self->update;
742} 876}
743 877
744sub set_offset { 878sub set_offset {
745 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
796 my $class = shift; 930 my $class = shift;
797 931
798 my $self; 932 my $self;
799 933
800 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
801 vertical => 1, 935 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 937 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
805 }, 939 },
806 ; 940 ;
807 941
808 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 944 slider => $slider,
811 @_, 945 @_,
812 ); 946 );
813 947
814 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
817 951
818 $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]);
819} 972}
820 973
821#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 975# update viewport offset on scroll
823 976
… …
867 1020
868our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
869 1022
870use CFClient::OpenGL; 1023use CFClient::OpenGL;
871 1024
872my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 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);
875 1032
876sub new { 1033sub new {
877 my $class = shift; 1034 my $class = shift;
878 1035
879 # TODO: user_x, user_y, overwrite moveto?
880
881 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1039 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
887 @_ 1043 @_
888 ); 1044 );
889 1045
890 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
891 align => 0, 1047 align => 0,
… …
944 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
945 1101
946 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
948 1104
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size;
953 }; 1110 };
954 1111
955 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1116 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
961 1118
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
963 1120
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update;
966 }; 1122 };
967 } 1123 }
968} 1124}
969 1125
970sub button_up { 1126sub button_up {
… …
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1146
991 my $border = $self->border; 1147 my $border = $self->border;
992 1148
993 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1154
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1001 1157
1002 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1163 }
1013 1164
1014 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1015 1166
… …
1031sub new { 1182sub new {
1032 my $class = shift; 1183 my $class = shift;
1033 1184
1034 $class->SUPER::new ( 1185 $class->SUPER::new (
1035 col_expand => [], 1186 col_expand => [],
1036 @_ 1187 @_,
1037 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1193}
1039 1194
1040sub add { 1195sub add {
1041 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1042 1197
1043 $child->set_parent ($self); 1198 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1045 1200
1046 $child->check_size; 1201 $self->realloc;
1047} 1202}
1048 1203
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# 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?
1054sub clear { 1205sub clear {
1055 my ($self) = @_; 1206 my ($self) = @_;
1056 1207
1057 my @children = $self->children; 1208 my @children = $self->children;
1058 delete $self->{children}; 1209 delete $self->{children};
… …
1060 for (@children) { 1211 for (@children) {
1061 delete $_->{parent}; 1212 delete $_->{parent};
1062 $_->hide; 1213 $_->hide;
1063 } 1214 }
1064 1215
1065 $self->update; 1216 $self->realloc;
1066} 1217}
1067 1218
1068sub get_wh { 1219sub get_wh {
1069 my ($self) = @_; 1220 my ($self) = @_;
1070 1221
… …
1101sub size_allocate { 1252sub size_allocate {
1102 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1103 1254
1104 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1105 1256
1106 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1108 1259
1109 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1317 }
1167} 1318}
1168 1319
1169############################################################################# 1320#############################################################################
1170 1321
1171package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1323
1175our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1176 1325
1177sub size_request { 1326sub size_request {
1178 my ($self) = @_; 1327 my ($self) = @_;
1179 1328
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1181 1330 ? (
1182 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1333 )
1185 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1186} 1338}
1187 1339
1188sub size_allocate { 1340sub size_allocate {
1189 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1190 1342
1191 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1344 my $children = $self->{children};
1194 1345
1195 my @h = map $_->{req_w}, @$children; 1346 my @req;
1196 1347
1197 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1198 1349 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } 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 {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1364 }
1213 } 1365 }
1214 1366
1215 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1216 1368
1217 my $y = 0; 1369 my $pos = 0;
1218 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1373
1223 $y += $h; 1374 $pos += $alloc;
1224 } 1375 }
1225 1376
1226 1 1377 1
1227} 1378}
1228 1379
1229############################################################################# 1380#############################################################################
1230 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
1231package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1232 1398
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1236 1400
1237sub size_request { 1401sub new {
1238 my ($self) = @_; 1402 my $class = shift;
1239 1403
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1241 1405 vertical => 1,
1242 ( 1406 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1407 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1408}
1286 1409
1287############################################################################# 1410#############################################################################
1288 1411
1289package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1429 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1308 fontsize => 1, 1431 fontsize => 1,
1309 align => -1, 1432 align => -1,
1310 valign => -1, 1433 valign => -1,
1311 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1312 can_events => 0, 1436 can_events => 0,
1313 %arg 1437 %arg
1314 ); 1438 );
1315 1439
1316 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1353 1477
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1356 1480
1481 $self->realloc;
1357 $self->update; 1482 $self->update;
1358 $self->check_size;
1359} 1483}
1360 1484
1361sub set_markup { 1485sub set_markup {
1362 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1363 1487
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1492
1369 $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;
1370 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1371 1495
1496 $self->realloc;
1372 $self->update; 1497 $self->update;
1373 $self->check_size;
1374} 1498}
1375 1499
1376sub size_request { 1500sub size_request {
1377 my ($self) = @_; 1501 my ($self) = @_;
1378 1502
… …
1392 1516
1393 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1395 } 1519 }
1396 1520
1397 ( 1521 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1522}
1402 1523
1403sub size_allocate { 1524sub size_allocate {
1404 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1405 1526
… …
1410 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1411 1532
1412 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1534 delete $self->{texture};
1414 1535
1415 $self->update; 1536 $self->realloc;
1416 $self->check_size;
1417} 1537}
1418 1538
1419sub _draw { 1539sub _draw {
1420 my ($self) = @_; 1540 my ($self) = @_;
1421 1541
… …
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1551
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433 1553
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1437 1557
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1441 1561
1442 $tex 1562 $tex
1443 }; 1563 };
1444 1564
… …
1473 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1474 can_hover => 1, 1594 can_hover => 1,
1475 can_focus => 1, 1595 can_focus => 1,
1476 valign => 0, 1596 valign => 0,
1477 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1478 @_ 1599 @_
1479 ) 1600 )
1480} 1601}
1481 1602
1482sub _set_text { 1603sub _set_text {
… …
1492 $self->{text} = $text; 1613 $self->{text} = $text;
1493 1614
1494 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1496 1617
1497 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1498} 1619}
1499 1620
1500sub set_text { 1621sub set_text {
1501 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1502 1623
1503 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1625 $self->_set_text ($text);
1505 $self->update; 1626
1506 $self->check_size; 1627 $self->realloc;
1507} 1628}
1508 1629
1509sub get_text { 1630sub get_text {
1510 $_[0]{text} 1631 $_[0]{text}
1511} 1632}
… …
1514 my ($self) = @_; 1635 my ($self) = @_;
1515 1636
1516 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1517 1638
1518 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1640}
1526 1641
1527sub key_down { 1642sub key_down {
1528 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1529 1644
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1663 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1664 $self->_emit ('escape');
1550 } elsif ($uni) { 1665 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1552 } 1667 }
1553 1668
1554 $self->_set_text ($text); 1669 $self->_set_text ($text);
1555 $self->update; 1670
1556 $self->check_size; 1671 $self->realloc;
1557} 1672}
1558 1673
1559sub focus_in { 1674sub focus_in {
1560 my ($self) = @_; 1675 my ($self) = @_;
1561 1676
… …
1641 if ($sym == 13) { 1756 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1647 $self->update; 1762 $self->update;
1648 1763
1649 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1688 1803
1689sub new { 1804sub new {
1690 my $class = shift; 1805 my $class = shift;
1691 1806
1692 $class->SUPER::new ( 1807 $class->SUPER::new (
1693 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1694 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1696 can_hover => 1, 1812 can_hover => 1,
1697 align => 0, 1813 align => 0,
1698 valign => 0, 1814 valign => 0,
1699 can_events => 1, 1815 can_events => 1,
1700 @_ 1816 @_
1701 ) 1817 )
1702} 1818}
1703 1819
1820sub activate { }
1821
1704sub button_up { 1822sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1706 1824
1825 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate");
1710 }
1711} 1828}
1712 1829
1713sub _draw { 1830sub _draw {
1714 my ($self) = @_; 1831 my ($self) = @_;
1715 1832
… …
1744 1861
1745sub new { 1862sub new {
1746 my $class = shift; 1863 my $class = shift;
1747 1864
1748 $class->SUPER::new ( 1865 $class->SUPER::new (
1749 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1750 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1872 state => 0,
… …
1758} 1876}
1759 1877
1760sub size_request { 1878sub size_request {
1761 my ($self) = @_; 1879 my ($self) = @_;
1762 1880
1763 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1764} 1882}
1765 1883
1766sub button_down { 1884sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1768 1886
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1773 } 1891 }
1774} 1892}
1775 1893
1776sub _draw { 1894sub _draw {
1777 my ($self) = @_; 1895 my ($self) = @_;
1778 1896
1779 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1780 1898
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1900
1783 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;
1784 1904
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1906
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1908
… …
2052 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2060 vertical => 0, 2180 vertical => 0,
2061 can_hover => 1, 2181 can_hover => 1,
2062 inner_pad => .05, 2182 inner_pad => 0.02,
2063 @_ 2183 @_
2064 ); 2184 );
2065 2185
2066 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2067 $self->update; 2187 $self->update;
2068 2188
2069 $self 2189 $self
2070} 2190}
2071 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
2072sub set_value { 2203sub set_value {
2073 my ($self, $value) = @_; 2204 my ($self, $value) = @_;
2074 2205
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2207
2077 $hi = $lo + 1 if $hi <= $lo; 2208 $hi = $lo + 1 if $hi <= $lo;
2078 2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2079 $value = $lo if $value < $lo; 2212 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2213 $value = $hi - $page if $value > $hi - $page;
2081 2214
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2216 if $unit;
2084 2217
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2219
2089 if ($value != $old_value) { 2220 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2221 $self->_emit (changed => $value);
2091 $self->update; 2222 $self->update;
2092 } 2223 }
2093} 2224}
2094 2225
2095sub size_request { 2226sub size_request {
2096 my ($self) = @_; 2227 my ($self) = @_;
2097 2228
2098 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2230}
2103 2231
2104sub button_down { 2232sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2106 2234
2107 $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
2108 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2109} 2240}
2110 2241
2111sub mouse_motion { 2242sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
… …
2114 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2247
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2249
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2251
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122 } 2253 }
2123} 2254}
2124 2255
2125sub update { 2256sub update {
2126 my ($self) = @_; 2257 my ($self) = @_;
2127 2258
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2260 $self->set_value ($self->{range}[0]);
2130 2261
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2132 2264
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2266
2135 $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;
2136 2269
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2270 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2271 $value = $value * $self->{scale} + $self->{offset};
2139 2272
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2274 $self->{knob_w} = $knob_w;
2147 }); 2275 });
2148 2276
2149 $self->SUPER::update; 2277 $self->SUPER::update;
2150} 2278}
2151 2279
… …
2175 # draw handle 2303 # draw handle
2176 $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);
2177 2305
2178 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2179} 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 (@_) }
2180 2349
2181############################################################################# 2350#############################################################################
2182 2351
2183package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2184 2353
… …
2214 2383
2215 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2385 $self->reflow;
2217} 2386}
2218 2387
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2388sub size_allocate {
2239 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2240 2390
2241 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2242 2392
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2396
2247 $self->reflow; 2397 $self->reflow;
2248} 2398}
2249 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
2250sub add_paragraph { 2434sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2252 2436
2253 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2254 2438 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2258 2442
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2444}
2264 2445
2265sub update { 2446sub update {
2266 my ($self) = @_; 2447 my ($self) = @_;
2267 2448
… …
2270 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2271 2452
2272 delete $self->{texture}; 2453 delete $self->{texture};
2273 2454
2274 $ROOT->on_post_alloc ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2275 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2459 my $height = 0;
2277 2460
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2279 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 }
2280 2476
2281 $self->{height} = $height; 2477 $self->{height} = $height;
2282 2478
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2480
2285 delete $self->{texture}; 2481 delete $self->{texture};
2286 } 2482 }
2287 2483
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2291 2487
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2488 my $top = int $self->{children}[1]{range}[0];
2296 2489
2297 my $y0 = $top; 2490 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2491 my $y1 = $top + $H;
2299 2492
2300 my $y = 0; 2493 my $y = 0;
2301 2494
2302 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2303 2496
2304 $layout->set_font ($self->{font}) if $self->{font}; 2497 $layout->set_font ($self->{font}) if $self->{font};
2305 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
2306 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2504 my $h = $par->[1];
2308 2505
2309 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2312 2510
2313 my ($W, $H) = $layout->size; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 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;
2315 } 2515 }
2316 2516
2317 $y += $h; 2517 $y += $h;
2318 } 2518 }
2319 2519
2320 glDisable GL_TEXTURE_2D; 2520 glDisable GL_BLEND;
2321 }; 2521 };
2322 }); 2522 });
2323} 2523}
2324 2524
2325sub _draw { 2525sub _draw {
2326 my ($self) = @_; 2526 my ($self) = @_;
2327 2527
2328 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2331 $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});
2332 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2333 2533
2334 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2335 2535
2336} 2536}
… …
2385 2585
2386sub new { 2586sub new {
2387 my $class = shift; 2587 my $class = shift;
2388 2588
2389 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2390 state => 0, 2590 state => 0,
2391 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2392 @_ 2592 @_
2393 ); 2593 );
2394 2594
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2595 $self
2401} 2596}
2402 2597
2403sub toggle_flopper { 2598sub toggle_flopper {
2404 my ($self) = @_; 2599 my ($self) = @_;
2405 2600
2406 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2602}
2418 2603
2419############################################################################# 2604#############################################################################
2420 2605
2421package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2434} 2619}
2435 2620
2436sub set_tooltip_from { 2621sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2438 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
2439 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2636 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2638 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2650
2457sub size_allocate { 2651sub size_allocate {
2458 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2459 2653
2460 $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 });
2461} 2673}
2462 2674
2463sub _draw { 2675sub _draw {
2464 my ($self) = @_; 2676 my ($self) = @_;
2465 2677
… …
2482 glVertex $w, $h; 2694 glVertex $w, $h;
2483 glVertex $w, 0; 2695 glVertex $w, 0;
2484 glEnd; 2696 glEnd;
2485 2697
2486 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2487 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2488} 2701}
2489 2702
2490############################################################################# 2703#############################################################################
2491 2704
… …
2496use CFClient::OpenGL; 2709use CFClient::OpenGL;
2497 2710
2498sub new { 2711sub new {
2499 my $class = shift; 2712 my $class = shift;
2500 2713
2501 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2502 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2503 @_, 2717 @_,
2504 ) 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
2505} 2735}
2506 2736
2507sub size_request { 2737sub size_request {
2508 (32, 8) 2738 (32, 8)
2509} 2739}
2510 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2511sub _draw { 2749sub _draw {
2512 my ($self) = @_; 2750 my ($self) = @_;
2513 2751
2514 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
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2764
2517 # TODO animation
2518 if ($tex) { 2765 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2524 } 2771 }
2525} 2772}
2526 2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2527############################################################################# 2783#############################################################################
2528 2784
2529package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2530 2786
2531our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558 2788
2559sub new { 2789sub new {
2560 my $class = shift; 2790 my $class = shift;
2561 2791
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2569 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_, 2794 @_,
2644 ); 2795 );
2645 2796
2646 $self 2797 $self
2647} 2798}
… …
2657 or ($a->{name} cmp $b->{name}) 2808 or ($a->{name} cmp $b->{name})
2658 } @$items; 2809 } @$items;
2659 2810
2660 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2661 2812
2813 my $row = 0;
2662 for my $item (@items) { 2814 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2815 CFClient::Item::update_widgets $item;
2664 $item->update_item ();
2665 }
2666 2816
2667 $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});
2668 2820
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2670} 2822 }
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675} 2823}
2676 2824
2677############################################################################# 2825#############################################################################
2678 2826
2679package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2714 2862
2715# 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)
2716sub popup { 2864sub popup {
2717 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2718 2866
2719 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2720 2868
2721 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2870 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2724 2872
2725 $self->show; 2873 $self->show;
2726 $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);
2727} 2875}
2728 2876
2729sub mouse_motion { 2877sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2731 2879
… …
2739 2887
2740 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2889 undef $GRAB;
2742 $self->hide; 2890 $self->hide;
2743 2891
2744 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2746 } 2894 }
2747} 2895}
2748 2896
2749############################################################################# 2897#############################################################################
… …
2811sub add { 2959sub add {
2812 my ($self, $text, %arg) = @_; 2960 my ($self, $text, %arg) = @_;
2813 2961
2814 $text =~ s/^\s+//; 2962 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2816 2966
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 2968
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 2970
… …
2863use CFClient::OpenGL; 3013use CFClient::OpenGL;
2864 3014
2865sub new { 3015sub new {
2866 my $class = shift; 3016 my $class = shift;
2867 3017
2868 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
3019 visible => 1,
2869 @_, 3020 @_,
2870 ) 3021 );
2871}
2872 3022
2873sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2874 my ($self, $x, $y, $w, $h) = @_;
2875 3024
2876 $self->{w} = $w; 3025 $self
2877 $self->{h} = $h;
2878}
2879
2880sub check_size {
2881 my ($self) = @_;
2882
2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2885} 3026}
2886 3027
2887sub size_request { 3028sub size_request {
2888 my ($self) = @_; 3029 my ($self) = @_;
2889 3030
2890 ($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
2891} 3046}
2892 3047
2893sub size_allocate { 3048sub size_allocate {
2894 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2895 3050
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3051 for my $child ($self->children) {
2903 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)};
2904 3053
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2907 3056
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3059
2914 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2915 } 3061 }
2916} 3062}
2917 3063
… …
2928} 3074}
2929 3075
2930sub update { 3076sub update {
2931 my ($self) = @_; 3077 my ($self) = @_;
2932 3078
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
2935} 3080}
2936 3081
2937sub add { 3082sub add {
2938 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
2939 3084
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3085 $_->{is_toplevel} = 1
2942 3086 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3087
2948 $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 }
2949} 3104}
2950 3105
2951sub on_refresh { 3106sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2953 3108
… …
2966 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2967 $_->() 3122 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
2969 } 3124 }
2970 3125
2971 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
2972 my @queue = ([], []); 3127 my @queue;
2973 3128
2974 for (;;) { 3129 while () {
2975 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
2976 # heuristic: check containers last 3131 #TODO use array-of-depth approach
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
2978 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
2979 } 3137 }
2980 3138
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
2982 3140
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
2984 ? @$widget{qw(user_w user_h)} 3142
2985 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
2986 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
2987 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990
2991 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
2993 3155
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
2995 3157
2996 $widget->{parent}->check_size
2997 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 }
2998 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
2999 } 3167 }
3000 } 3168 }
3001 3169
3002 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 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)};
3005 3178
3006 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3008 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}) {
3009 $widget->{w} = $w; 3186 $widget->{w} = $w;
3010 $widget->{h} = $h; 3187 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3188
3012 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3013 } 3191 }
3014 } 3192 }
3015 3193
3016 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3017 $_->() 3195 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3019 } 3197 }
3020 3198
3199
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3024 3203
3025 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3205 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3208 glLoadIdentity;
3030 3209
3031 $self->_draw; 3210 $self->_draw;
3032} 3211}
3033 3212
3034############################################################################# 3213#############################################################################
3035 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
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
3036package CFClient::UI; 3392package CFClient::UI;
3037 3393
3038$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
3039$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3040 3396

Diff Legend

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