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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 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) = @_;
282 379
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
285} 398}
286 399
287# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
288sub coord2local { 401sub coord2local {
289 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
… …
304 return if $FOCUS == $self; 417 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
306 419
307 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
308 421
309 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
310 423
311 $focus->update if $focus; 424 $focus->update if $focus;
312 $FOCUS->update; 425 $FOCUS->update;
313} 426}
314 427
… …
317 430
318 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
319 432
320 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
321 434
322 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
323 436
324 $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;
325} 441}
326 442
327sub mouse_motion { } 443sub mouse_motion { }
328sub button_up { } 444sub button_up { }
329sub key_down { } 445sub key_down { }
330sub key_up { } 446sub key_up { }
331 447
332sub button_down { 448sub button_down {
333 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
334 450
335 $self->focus_in; 451 $self->focus_in;
… …
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
342sub 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}
343 529
344sub draw { 530sub draw {
345 my ($self) = @_; 531 my ($self) = @_;
346 532
347 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
364 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
365 glEnd; 551 glEnd;
366 glDisable GL_BLEND; 552 glDisable GL_BLEND;
367 } 553 }
368 554
369 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
370 glPushMatrix; 556 glPushMatrix;
371 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 560 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
376 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
377 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
378 glEnd; 564 glEnd;
379 glPopMatrix; 565 glPopMatrix;
380 #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;
381 } 567 }
382} 568}
… …
385 my ($self) = @_; 571 my ($self) = @_;
386 572
387 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
388} 574}
389 575
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436}
437
438sub DESTROY { 576sub DESTROY {
439 my ($self) = @_; 577 my ($self) = @_;
440 578
441 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
442 #$self->deactivate; 580 #$self->deactivate;
… …
455 my $class = shift; 593 my $class = shift;
456 594
457 # range [value, low, high, page] 595 # range [value, low, high, page]
458 596
459 $class->SUPER::new ( 597 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
462 @_ 600 @_
463 ) 601 )
464} 602}
465 603
466sub _draw { 604sub _draw {
467 my ($self) = @_; 605 my ($self) = @_;
468 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
470 613
471 glEnable GL_BLEND; 614 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
474 617
475 glBegin GL_QUADS; 618 glBegin GL_QUADS;
476 glVertex 0 , 0; 619 glVertex 0 , 0;
477 glVertex 0 , $h; 620 glVertex 0 , $h;
478 glVertex $w, $h; 621 glVertex $w, $h;
479 glVertex $w, 0; 622 glVertex $w, 0;
480 glEnd; 623 glEnd;
481 624
482 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
483} 627}
484 628
485############################################################################# 629#############################################################################
486 630
487package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
494} 638}
495 639
496sub size_request { 640sub size_request {
497 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
498} 644}
499 645
500sub draw { } 646sub draw { }
501 647
502############################################################################# 648#############################################################################
… …
531 $self->{children} = [ 677 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
534 ]; 680 ];
535 681
536 $self->check_size (1); 682 $self->realloc;
537 $self->update;
538} 683}
539 684
540sub children { 685sub children {
541 @{ $_[0]{children} } 686 @{ $_[0]{children} }
542} 687}
… …
547 delete $child->{parent}; 692 delete $child->{parent};
548 $child->hide; 693 $child->hide;
549 694
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 696
552 $self->check_size; 697 $self->realloc;
553 $self->update;
554} 698}
555 699
556sub clear { 700sub clear {
557 my ($self) = @_; 701 my ($self) = @_;
558 702
… …
562 for (@$children) { 706 for (@$children) {
563 delete $_->{parent}; 707 delete $_->{parent};
564 $_->hide; 708 $_->hide;
565 } 709 }
566 710
567 $self->check_size; 711 $self->realloc;
568 $self->update;
569} 712}
570 713
571sub find_widget { 714sub find_widget {
572 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
573 716
… …
671 $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 {
672 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
674 817
675 $self->_render; 818 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 819 };
684} 820}
685 821
686sub _draw { 822sub _draw {
687 my ($self) = @_; 823 my ($self) = @_;
… …
691 my $tex = $self->{texture} 827 my $tex = $self->{texture}
692 or return; 828 or return;
693 829
694 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
697 833
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 835
700 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
701} 837}
… …
704 840
705package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
706 842
707our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
708 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
709sub size_request { 855sub size_request {
710 my ($self) = @_; 856 my ($self) = @_;
711 857
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 859
715 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
716} 864}
717 865
718sub size_allocate { 866sub size_allocate {
719 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
720 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);
721 $self->update; 875 $self->update;
722} 876}
723 877
724sub set_offset { 878sub set_offset {
725 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
776 my $class = shift; 930 my $class = shift;
777 931
778 my $self; 932 my $self;
779 933
780 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
781 vertical => 1, 935 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 937 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
785 }, 939 },
786 ; 940 ;
787 941
788 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 944 slider => $slider,
791 @_, 945 @_,
792 ); 946 );
793 947
794 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp}); 949 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
797 951
798 $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]);
799} 972}
800 973
801#TODO# update range on size_allocate depending on child 974#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 975# update viewport offset on scroll
803 976
… …
847 1020
848our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
849 1022
850use CFClient::OpenGL; 1023use CFClient::OpenGL;
851 1024
852my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855 1032
856sub new { 1033sub new {
857 my $class = shift; 1034 my $class = shift;
858 1035
859 # TODO: user_x, user_y, overwrite moveto?
860
861 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1039 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
867 @_ 1043 @_
868 ); 1044 );
869 1045
870 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
871 align => 0, 1047 align => 0,
… …
924 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
925 1101
926 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
928 1104
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size;
933 }; 1110 };
934 1111
935 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1116 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
941 1118
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
943 1120
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update;
946 }; 1122 };
947 } 1123 }
948} 1124}
949 1125
950sub button_up { 1126sub button_up {
… …
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1146
971 my $border = $self->border; 1147 my $border = $self->border;
972 1148
973 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1154
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
981 1157
982 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1163 }
993 1164
994 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
995 1166
… …
1011sub new { 1182sub new {
1012 my $class = shift; 1183 my $class = shift;
1013 1184
1014 $class->SUPER::new ( 1185 $class->SUPER::new (
1015 col_expand => [], 1186 col_expand => [],
1016 @_ 1187 @_,
1017 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1193}
1019 1194
1020sub add { 1195sub add {
1021 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1022 1197
1023 $child->set_parent ($self); 1198 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1025 1200
1026 $child->check_size; 1201 $self->realloc;
1027} 1202}
1028 1203
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# 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?
1034sub clear { 1205sub clear {
1035 my ($self) = @_; 1206 my ($self) = @_;
1036 1207
1037 my @children = $self->children; 1208 my @children = $self->children;
1038 delete $self->{children}; 1209 delete $self->{children};
… …
1040 for (@children) { 1211 for (@children) {
1041 delete $_->{parent}; 1212 delete $_->{parent};
1042 $_->hide; 1213 $_->hide;
1043 } 1214 }
1044 1215
1045 $self->update; 1216 $self->realloc;
1046} 1217}
1047 1218
1048sub get_wh { 1219sub get_wh {
1049 my ($self) = @_; 1220 my ($self) = @_;
1050 1221
… …
1081sub size_allocate { 1252sub size_allocate {
1082 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1083 1254
1084 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1085 1256
1086 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1088 1259
1089 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1146 } 1317 }
1147} 1318}
1148 1319
1149############################################################################# 1320#############################################################################
1150 1321
1151package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1152
1153# TODO: wrap into common Box base class
1154 1323
1155our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1156 1325
1157sub size_request { 1326sub size_request {
1158 my ($self) = @_; 1327 my ($self) = @_;
1159 1328
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1161 1330 ? (
1162 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1163 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164 (List::Util::max map $_->[1], @alloc), 1333 )
1165 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1166} 1338}
1167 1339
1168sub size_allocate { 1340sub size_allocate {
1169 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1170 1342
1171 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1172
1173 my $children = $self->{children}; 1344 my $children = $self->{children};
1174 1345
1175 my @h = map $_->{req_w}, @$children; 1346 my @req;
1176 1347
1177 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1178 1349 @req = ($space / (@$children || 1)) x @$children;
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } 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 {
1183 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184 $exp ||= 1;
1185 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1186 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 } 1364 }
1193 } 1365 }
1194 1366
1195 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1196 1368
1197 my $y = 0; 1369 my $pos = 0;
1198 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1201 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202 1373
1203 $y += $h; 1374 $pos += $alloc;
1204 } 1375 }
1205 1376
1206 1 1377 1
1207} 1378}
1208 1379
1209############################################################################# 1380#############################################################################
1210 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
1211package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1212 1398
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1216 1400
1217sub size_request { 1401sub new {
1218 my ($self) = @_; 1402 my $class = shift;
1219 1403
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1221 1405 vertical => 1,
1222 ( 1406 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1407 )
1226} 1408}
1227 1409
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1410#############################################################################
1268 1411
1269package CFClient::UI::Label; 1412package CFClient::UI::Label;
1270 1413
1271our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1272 1415
1273use CFClient::OpenGL; 1416use CFClient::OpenGL;
1274 1417
1275sub new { 1418sub new {
1276 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1277 1420
1278 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1280 #font => default_font 1425 #font => default_font
1281 #text => initial text 1426 #text => initial text
1282 #markup => initial narkup 1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1284 fontsize => 1, 1431 fontsize => 1,
1285 align => -1, 1432 align => -1,
1286 valign => -1, 1433 valign => -1,
1287 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1288 can_events => 0, 1436 can_events => 0,
1289 %arg 1437 %arg
1290 ); 1438 );
1291 1439
1292 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1302 } 1450 }
1303 1451
1304 $self 1452 $self
1305} 1453}
1306 1454
1307sub escape { 1455sub escape($) {
1308 local $_ = $_[1]; 1456 local $_ = $_[0];
1309 1457
1310 s/&/&amp;/g; 1458 s/&/&amp;/g;
1311 s/>/&gt;/g; 1459 s/>/&gt;/g;
1312 s/</&lt;/g; 1460 s/</&lt;/g;
1313 1461
1314 $_[1] 1462 $_
1315} 1463}
1316 1464
1317sub update { 1465sub update {
1318 my ($self) = @_; 1466 my ($self) = @_;
1319 1467
… …
1328 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1329 1477
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1332 1480
1481 $self->realloc;
1333 $self->update; 1482 $self->update;
1334 $self->check_size;
1335} 1483}
1336 1484
1337sub set_markup { 1485sub set_markup {
1338 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1339 1487
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1492
1345 $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;
1346 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1347 1495
1496 $self->realloc;
1348 $self->update; 1497 $self->update;
1349 $self->check_size;
1350} 1498}
1351 1499
1352sub size_request { 1500sub size_request {
1353 my ($self) = @_; 1501 my ($self) = @_;
1354 1502
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $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});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1508
1359 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1360 1510
1361 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1366 1516
1367 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1369 } 1519 }
1370 1520
1371 ( 1521 ($w, $h)
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1522}
1376 1523
1377sub size_allocate { 1524sub size_allocate {
1378 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1379 1526
1380 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1381} 1529}
1382 1530
1383sub set_fontsize { 1531sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1385 1533
1386 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1535 delete $self->{texture};
1388 1536
1389 $self->update; 1537 $self->realloc;
1390 $self->check_size;
1391} 1538}
1392 1539
1393sub _draw { 1540sub _draw {
1394 my ($self) = @_; 1541 my ($self) = @_;
1542
1543 $self->SUPER::_draw; # draw background, if applicable
1395 1544
1396 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1546 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1552
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1554
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1406 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1407 1558
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1410 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1411 1562
1412 $tex 1563 $tex
1413 }; 1564 };
1414 1565
… …
1443 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1444 can_hover => 1, 1595 can_hover => 1,
1445 can_focus => 1, 1596 can_focus => 1,
1446 valign => 0, 1597 valign => 0,
1447 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1448 @_ 1600 @_
1449 ) 1601 )
1450} 1602}
1451 1603
1452sub _set_text { 1604sub _set_text {
… …
1462 $self->{text} = $text; 1614 $self->{text} = $text;
1463 1615
1464 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1466 1618
1467 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1468} 1620}
1469 1621
1470sub set_text { 1622sub set_text {
1471 my ($self, $text) = @_; 1623 my ($self, $text) = @_;
1472 1624
1473 $self->{cursor} = length $text; 1625 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1626 $self->_set_text ($text);
1475 $self->update; 1627
1476 $self->check_size; 1628 $self->realloc;
1477} 1629}
1478 1630
1479sub get_text { 1631sub get_text {
1480 $_[0]{text} 1632 $_[0]{text}
1481} 1633}
… …
1484 my ($self) = @_; 1636 my ($self) = @_;
1485 1637
1486 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1487 1639
1488 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1641}
1496 1642
1497sub key_down { 1643sub key_down {
1498 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1499 1645
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1664 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1665 $self->_emit ('escape');
1520 } elsif ($uni) { 1666 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1668 }
1523 1669
1524 $self->_set_text ($text); 1670 $self->_set_text ($text);
1525 $self->update; 1671
1526 $self->check_size; 1672 $self->realloc;
1527} 1673}
1528 1674
1529sub focus_in { 1675sub focus_in {
1530 my ($self) = @_; 1676 my ($self) = @_;
1531 1677
… …
1611 if ($sym == 13) { 1757 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1617 $self->update; 1763 $self->update;
1618 1764
1619 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1658 1804
1659sub new { 1805sub new {
1660 my $class = shift; 1806 my $class = shift;
1661 1807
1662 $class->SUPER::new ( 1808 $class->SUPER::new (
1663 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1664 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1667 can_hover => 1, 1813 can_hover => 1,
1668 align => 0, 1814 align => 0,
1669 valign => 0, 1815 valign => 0,
1670 can_events => 1, 1816 can_events => 1,
1671 @_ 1817 @_
1672 ) 1818 )
1673} 1819}
1674 1820
1821sub activate { }
1822
1675sub button_up { 1823sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1677 1825
1826 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1829}
1683 1830
1684sub _draw { 1831sub _draw {
1685 my ($self) = @_; 1832 my ($self) = @_;
1686 1833
… …
1715 1862
1716sub new { 1863sub new {
1717 my $class = shift; 1864 my $class = shift;
1718 1865
1719 $class->SUPER::new ( 1866 $class->SUPER::new (
1720 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1721 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1871 bg => [0, 0, 0, 0.2],
1872 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1873 state => 0,
1724 can_hover => 1, 1874 can_hover => 1,
1725 @_ 1875 @_
1726 ) 1876 )
1727} 1877}
1728 1878
1729sub size_request { 1879sub size_request {
1730 my ($self) = @_; 1880 my ($self) = @_;
1731 1881
1732 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1733} 1883}
1734 1884
1735sub button_down { 1885sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1737 1887
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1742 } 1892 }
1743} 1893}
1744 1894
1745sub _draw { 1895sub _draw {
1746 my ($self) = @_; 1896 my ($self) = @_;
1747 1897
1748 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1749 1899
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1901
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1905
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1907
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1909
… …
2019 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2172 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2179 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2180 min_h => $::WIDTH / 80,
2027 vertical => 0, 2181 vertical => 0,
2028 can_hover => 1, 2182 can_hover => 1,
2029 inner_pad => .05, 2183 inner_pad => 0.02,
2030 @_ 2184 @_
2031 ); 2185 );
2032 2186
2033 $self->set_value ($self->{range}[0]); 2187 $self->set_value ($self->{range}[0]);
2034 $self->update; 2188 $self->update;
2035 2189
2036 $self 2190 $self
2037} 2191}
2038 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2039sub set_value { 2204sub set_value {
2040 my ($self, $value) = @_; 2205 my ($self, $value) = @_;
2041 2206
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2208
2044 $hi = $lo + 1 if $hi <= $lo; 2209 $hi = $lo + 1 if $hi <= $lo;
2045 2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2046 $value = $lo if $value < $lo; 2213 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2214 $value = $hi - $page if $value > $hi - $page;
2048 2215
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2217 if $unit;
2051 2218
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2220
2056 if ($value != $old_value) { 2221 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2222 $self->_emit (changed => $value);
2058 $self->update; 2223 $self->update;
2059 } 2224 }
2060} 2225}
2061 2226
2062sub size_request { 2227sub size_request {
2063 my ($self) = @_; 2228 my ($self) = @_;
2064 2229
2065 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
2066 my $h = $self->{req_h};
2067
2068 $self->{vertical} ? ($h, $w) : ($w, $h)
2069} 2231}
2070 2232
2071sub button_down { 2233sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
2073 2235
2074 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
2075 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
2076} 2241}
2077 2242
2078sub mouse_motion { 2243sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
… …
2081 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2248
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2250
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2252
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2089 } 2254 }
2090} 2255}
2091 2256
2092sub update { 2257sub update {
2093 my ($self) = @_; 2258 my ($self) = @_;
2094 2259
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]); 2261 $self->set_value ($self->{range}[0]);
2097 2262
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
2099 2265
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2267
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2270
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2271 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2272 $value = $value * $self->{scale} + $self->{offset};
2106 2273
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2275 $self->{knob_w} = $knob_w;
2114 }); 2276 });
2115 2277
2116 $self->SUPER::update; 2278 $self->SUPER::update;
2117} 2279}
2118 2280
… …
2124 glScale $self->{w}, $self->{h}; 2286 glScale $self->{w}, $self->{h};
2125 2287
2126 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
2128 2290
2291 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2293 }
2132 2294
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2297
… …
2142 # draw handle 2304 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2306
2145 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2146} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
2147 2350
2148############################################################################# 2351#############################################################################
2149 2352
2150package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2151 2354
… …
2181 2384
2182 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2386 $self->reflow;
2184} 2387}
2185 2388
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2389sub size_allocate {
2206 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2207 2391
2208 $self->SUPER::size_allocate ($w, $h); 2392 $self->SUPER::size_allocate ($w, $h);
2209 2393
… …
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2397
2214 $self->reflow; 2398 $self->reflow;
2215} 2399}
2216 2400
2401sub text_size {
2402 my ($self, $text, $indent) = @_;
2403
2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2408 $layout->set_markup ($text);
2409
2410 $layout->size
2411}
2412
2413sub reflow {
2414 my ($self) = @_;
2415
2416 $self->{need_reflow}++;
2417 $self->update;
2418}
2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
2217sub add_paragraph { 2435sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2219 2437
2220 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2221 2439 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2225 2443
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2229 $self->{children}[1]->update;
2230} 2445}
2231 2446
2232sub update { 2447sub update {
2233 my ($self) = @_; 2448 my ($self) = @_;
2234 2449
… …
2237 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2238 2453
2239 delete $self->{texture}; 2454 delete $self->{texture};
2240 2455
2241 $ROOT->on_post_alloc ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2242 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2460 my $height = 0;
2244 2461
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2246 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2247 2477
2248 $self->{height} = $height; 2478 $self->{height} = $height;
2249 2479
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2481
2252 delete $self->{texture}; 2482 delete $self->{texture};
2253 } 2483 }
2254 2484
2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2256 glClearColor 0, 0, 0, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2258 2488
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2489 my $top = int $self->{children}[1]{range}[0];
2263 2490
2264 my $y0 = $top; 2491 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2492 my $y1 = $top + $H;
2266 2493
2267 my $y = 0; 2494 my $y = 0;
2268 2495
2269 my $layout = $self->{layout}; 2496 my $layout = $self->{layout};
2270 2497
2271 $layout->set_font ($self->{font}) if $self->{font}; 2498 $layout->set_font ($self->{font}) if $self->{font};
2272 2499
2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503
2273 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2505 my $h = $par->[1];
2275 2506
2276 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2279 2511
2280 my ($W, $H) = $layout->size; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2513
2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2516 }
2283 2517
2284 $y += $h; 2518 $y += $h;
2285 } 2519 }
2286 2520
2287 glDisable GL_TEXTURE_2D; 2521 glDisable GL_BLEND;
2288 }; 2522 };
2289 }); 2523 });
2290} 2524}
2291 2525
2292sub _draw { 2526sub _draw {
2293 my ($self) = @_; 2527 my ($self) = @_;
2294 2528
2295 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2300 2534
2301 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2302 2536
2303} 2537}
… …
2352 2586
2353sub new { 2587sub new {
2354 my $class = shift; 2588 my $class = shift;
2355 2589
2356 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2357 state => 0, 2591 state => 0,
2358 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2359 @_ 2593 @_
2360 ); 2594 );
2361 2595
2362 if ($self->{state}) {
2363 $self->{state} = 0;
2364 $self->toggle_flopper;
2365 }
2366
2367 $self 2596 $self
2368} 2597}
2369 2598
2370sub toggle_flopper { 2599sub toggle_flopper {
2371 my ($self) = @_; 2600 my ($self) = @_;
2372 2601
2373 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2374 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open");
2378 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close");
2381 }
2382
2383 $self->emit (changed => $self->{state});
2384} 2603}
2385 2604
2386############################################################################# 2605#############################################################################
2387 2606
2388package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2401} 2620}
2402 2621
2403sub set_tooltip_from { 2622sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2405 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2406 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2637 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2641 );
2413} 2642}
2414 2643
2415sub size_request { 2644sub size_request {
2416 my ($self) = @_; 2645 my ($self) = @_;
… …
2422 2651
2423sub size_allocate { 2652sub size_allocate {
2424 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2425 2654
2426 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2427} 2674}
2428 2675
2429sub _draw { 2676sub _draw {
2430 my ($self) = @_; 2677 my ($self) = @_;
2431 2678
… …
2448 glVertex $w, $h; 2695 glVertex $w, $h;
2449 glVertex $w, 0; 2696 glVertex $w, 0;
2450 glEnd; 2697 glEnd;
2451 2698
2452 glTranslate 2 - 0.375, 2 - 0.375; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2453 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2454} 2702}
2455 2703
2456############################################################################# 2704#############################################################################
2457 2705
… …
2462use CFClient::OpenGL; 2710use CFClient::OpenGL;
2463 2711
2464sub new { 2712sub new {
2465 my $class = shift; 2713 my $class = shift;
2466 2714
2467 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2468 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2469 @_, 2718 @_,
2470 ) 2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2471} 2736}
2472 2737
2473sub size_request { 2738sub size_request {
2474 (32, 8) 2739 (32, 8)
2475} 2740}
2476 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2477sub _draw { 2750sub _draw {
2478 my ($self) = @_; 2751 my ($self) = @_;
2479 2752
2480 return unless $::CONN;#d# manage and cache textures differently 2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2765
2483 # TODO animation
2484 if ($tex) { 2766 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2490 } 2772 }
2491} 2773}
2492 2774
2493############################################################################# 2775sub DESTROY {
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_; 2776 my ($self) = @_;
2592 2777
2593 $self->{scrolled}->clear; 2778 $self->{timer}->cancel
2594 return unless $items; 2779 if $self->{timer};
2595 2780
2596 my @items = sort { 2781 $self->SUPER::DESTROY;
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619} 2782}
2620 2783
2621############################################################################# 2784#############################################################################
2622 2785
2623package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
… …
2658 2821
2659# popup given the event (must be a mouse button down event currently) 2822# popup given the event (must be a mouse button down event currently)
2660sub popup { 2823sub popup {
2661 my ($self, $ev) = @_; 2824 my ($self, $ev) = @_;
2662 2825
2663 $self->emit ("popdown"); 2826 $self->_emit ("popdown");
2664 2827
2665 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2829 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2668 2831
2669 $self->show; 2832 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671} 2834}
2672 2835
2673sub mouse_motion { 2836sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2675 2838
… …
2683 2846
2684 if ($ev->{button} == $self->{button}) { 2847 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2848 undef $GRAB;
2686 $self->hide; 2849 $self->hide;
2687 2850
2688 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2852 $self->{hover}[1]->() if $self->{hover};
2690 } 2853 }
2691} 2854}
2692 2855
2693############################################################################# 2856#############################################################################
2694 2857
2695package CFClient::UI::Statusbox; 2858package CFClient::UI::Statusbox;
2696 2859
2697our @ISA = CFClient::UI::VBox::; 2860our @ISA = CFClient::UI::VBox::;
2861
2862sub new {
2863 my $class = shift;
2864
2865 $class->SUPER::new (
2866 fontsize => 0.8,
2867 @_,
2868 )
2869}
2698 2870
2699sub reorder { 2871sub reorder {
2700 my ($self) = @_; 2872 my ($self) = @_;
2701 my $NOW = time; 2873 my $NOW = time;
2702 2874
… …
2722 : $item->{text}; 2894 : $item->{text};
2723 2895
2724 for ($short) { 2896 for ($short) {
2725 s/^\s+//; 2897 s/^\s+//;
2726 s/\s+/ /g; 2898 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 2899 }
2730 2900
2731 new CFClient::UI::Label 2901 new CFClient::UI::Label
2732 markup => $short, 2902 markup => $short,
2733 tooltip => $item->{tooltip}, 2903 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 2904 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 2905 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 2906 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 2908 fg => $item->{fg},
2738 can_events => 1, 2909 can_events => 1,
2739 can_hover => 1 2910 can_hover => 1
2740 }; 2911 };
2741 } 2912 }
… …
2747sub add { 2918sub add {
2748 my ($self, $text, %arg) = @_; 2919 my ($self, $text, %arg) = @_;
2749 2920
2750 $text =~ s/^\s+//; 2921 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2752 2925
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 2927
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 2929
… …
2768 $self->{item}{$group} = { 2941 $self->{item}{$group} = {
2769 id => ++$self->{id}, 2942 id => ++$self->{id},
2770 text => $text, 2943 text => $text,
2771 timeout => $timeout, 2944 timeout => $timeout,
2772 tooltip => $text, 2945 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 2946 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 2947 pri => 0,
2776 count => 1, 2948 count => 1,
2777 %arg, 2949 %arg,
2778 }; 2950 };
2779 } 2951 }
2780 2952
2781 $self->reorder; 2953 $self->reorder;
2782} 2954}
2783 2955
2956sub reconfigure {
2957 my ($self) = @_;
2958
2959 delete $_->{label}
2960 for values %{ $self->{item} || {} };
2961
2962 $self->reorder;
2963 $self->SUPER::reconfigure;
2964}
2965
2784############################################################################# 2966#############################################################################
2785 2967
2786package CFClient::UI::Root; 2968package CFClient::UI::Inventory;
2787 2969
2788our @ISA = CFClient::UI::Container::; 2970our @ISA = CFClient::UI::ScrolledWindow::;
2789
2790use CFClient::OpenGL;
2791 2971
2792sub new { 2972sub new {
2793 my $class = shift; 2973 my $class = shift;
2794 2974
2795 $class->SUPER::new ( 2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2796 @_, 2977 @_,
2797 ) 2978 );
2798}
2799 2979
2800sub configure { 2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
2801 my ($self, $x, $y, $w, $h) = @_; 3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2802 3129
2803 $self->{w} = $w; 3130 $self->clear_command_list;
2804 $self->{h} = $h; 3131 $self->{recording} = 0;
2805} 3132 $self->{rec_btn}->set_text ("start recording");
2806 3133
2807sub check_size { 3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
2808 my ($self) = @_; 3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
2809 3152
2810 $self->size_allocate ($self->{w}, $self->{h}) 3153sub update_binding_widgets {
2811 if $self->{w}; 3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
3259package CFClient::UI::Root;
3260
3261our @ISA = CFClient::UI::Container::;
3262
3263use CFClient::OpenGL;
3264
3265sub new {
3266 my $class = shift;
3267
3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
2812} 3276}
2813 3277
2814sub size_request { 3278sub size_request {
2815 my ($self) = @_; 3279 my ($self) = @_;
2816 3280
2817 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
2818} 3296}
2819 3297
2820sub size_allocate { 3298sub size_allocate {
2821 my ($self, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2822 3300
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2829 for my $child ($self->children) { 3301 for my $child ($self->children) {
2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2831 3303
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3304 $X = $child->{force_x} if exists $child->{force_x};
2833 if exists $child->{req_x}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
2834 3306
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3307 $X = _to_pixel $X, $W, $self->{w};
2836 if exists $child->{req_y}; 3308 $Y = _to_pixel $Y, $H, $self->{h};
2837
2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840 3309
2841 $child->configure ($X, $Y, $W, $H); 3310 $child->configure ($X, $Y, $W, $H);
2842 } 3311 }
2843} 3312}
2844 3313
… …
2855} 3324}
2856 3325
2857sub update { 3326sub update {
2858 my ($self) = @_; 3327 my ($self) = @_;
2859 3328
2860 $self->check_size;
2861 $::WANT_REFRESH++; 3329 $::WANT_REFRESH++;
2862} 3330}
2863 3331
2864sub add { 3332sub add {
2865 my ($self, @children) = @_; 3333 my ($self, @children) = @_;
2866 3334
2867 for my $child (@children) {
2868 $child->{toplevel} = 1; 3335 $_->{is_toplevel} = 1
2869 3336 for @children;
2870 # integerise window positions
2871 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y};
2873 }
2874 3337
2875 $self->SUPER::add (@children); 3338 $self->SUPER::add (@children);
3339}
3340
3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
2876} 3354}
2877 3355
2878sub on_refresh { 3356sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2880 3358
… …
2893 while ($self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2894 $_->() 3372 $_->()
2895 for values %{delete $self->{refresh_hook}}; 3373 for values %{delete $self->{refresh_hook}};
2896 } 3374 }
2897 3375
2898 if ($self->{check_size}) { 3376 if ($self->{realloc}) {
2899 my @queue = ([], []); 3377 my @queue;
2900 3378
2901 for (;;) { 3379 while () {
2902 if ($self->{check_size}) { 3380 if ($self->{realloc}) {
2903 # heuristic: check containers last 3381 #TODO use array-of-depth approach
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3382
2905 for values %{delete $self->{check_size}} 3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
2906 } 3387 }
2907 3388
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3389 my $widget = pop @queue || last;
2909 3390
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3391 $widget->{visible} or last; # do not resize invisible widgets
2911 ? @$widget{qw(user_w user_h)} 3392
2912 : $widget->size_request; 3393 my ($w, $h) = $widget->size_request;
2913 3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
2914 if (delete $widget->{force_alloc} 3402 || delete $widget->{force_realloc}) {
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917
2918 $widget->{req_w} = $w; 3403 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h; 3404 $widget->{req_h} = $h;
2920 3405
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3406 $self->{size_alloc}{$widget+0} = $widget;
2922 3407
2923 $widget->{parent}->check_size
2924 if $widget->{parent}; 3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
2925 } 3414 }
3415
3416 delete $self->{realloc}{$widget+0};
2926 } 3417 }
2927 } 3418 }
2928 3419
2929 while ($self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) { 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
2931 my ($widget, $w, $h) = @$_; 3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2932 3428
2933 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
2935 3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
2936 $widget->{w} = $w; 3436 $widget->{w} = $w;
2937 $widget->{h} = $h; 3437 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h); 3438
2939 $widget->emit (size_allocate => $w, $h); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
2940 } 3441 }
2941 } 3442 }
2942 3443
2943 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
2944 $_->() 3445 $_->()
2945 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
2946 } 3447 }
2947 3448
3449
2948 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2951 3453
2952 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3455 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3458 glLoadIdentity;
2957 3459
2958 $self->_draw; 3460 $self->_draw;
2959} 3461}
… …
2961############################################################################# 3463#############################################################################
2962 3464
2963package CFClient::UI; 3465package CFClient::UI;
2964 3466
2965$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3469
29681 34701
2969 3471

Diff Legend

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