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

Diff Legend

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