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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 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
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 223
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 }
235
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 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};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 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
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $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;
238 } 368 }
239} 369}
240 370
241sub size_allocate { 371sub size_allocate {
242 # nothing to be done 372 # nothing to be done
243} 373}
244 374
245sub children { 375sub children {
246} 376}
247 377
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258}
259
260sub set_max_size { 378sub set_max_size {
261 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
262 380
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 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 }
265} 399}
266 400
267# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
268sub coord2local { 402sub coord2local {
269 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 418 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
286 420
287 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
288 422
289 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
290 424
291 $focus->update if $focus; 425 $focus->update if $focus;
292 $FOCUS->update; 426 $FOCUS->update;
293} 427}
294 428
… …
297 431
298 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
299 433
300 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
301 435
302 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
303 437
304 $focus->update if $focus; #? 438 $focus->update if $focus; #?
305}
306 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
307sub mouse_motion { } 444sub mouse_motion { 0 }
308sub button_up { } 445sub button_up { 0 }
309sub key_down { } 446sub key_down { 0 }
310sub key_up { } 447sub key_up { 0 }
311 448
312sub button_down { 449sub button_down {
313 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
314 451
315 $self->focus_in; 452 $self->focus_in;
316}
317 453
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
323 530
324sub draw { 531sub draw {
325 my ($self) = @_; 532 my ($self) = @_;
326 533
327 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
328 545
329 glPushMatrix; 546 glPushMatrix;
330 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
331 $self->_draw; 548 $self->_draw;
332 glPopMatrix; 549 glPopMatrix;
… …
344 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
345 glEnd; 562 glEnd;
346 glDisable GL_BLEND; 563 glDisable GL_BLEND;
347 } 564 }
348 565
349 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
350 glPushMatrix; 567 glPushMatrix;
351 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 571 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
358 glEnd; 575 glEnd;
359 glPopMatrix; 576 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 578 }
362} 579}
363 580
364sub _draw { 581sub _draw {
365 my ($self) = @_; 582 my ($self) = @_;
366 583
367 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
368} 585}
369 586
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
389}
390
391sub check_size {
392 my ($self) = @_;
393
394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395}
396
397sub update {
398 my ($self) = @_;
399
400 $self->{parent}->update
401 if $self->{parent};
402}
403
404sub connect {
405 my ($self, $signal, $cb) = @_;
406
407 push @{ $self->{signal_cb}{$signal} }, $cb;
408}
409
410sub emit {
411 my ($self, $signal, @args) = @_;
412
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
414}
415
416sub DESTROY { 587sub DESTROY {
417 my ($self) = @_; 588 my ($self) = @_;
418 589
590 delete $WIDGET{$self+0};
419 #$self->deactivate; 591 #$self->deactivate;
420} 592}
421 593
422############################################################################# 594#############################################################################
423 595
… …
432 my $class = shift; 604 my $class = shift;
433 605
434 # range [value, low, high, page] 606 # range [value, low, high, page]
435 607
436 $class->SUPER::new ( 608 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 609 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 610 #active_bg => [1, 1, 1, 0.5],
439 @_ 611 @_
440 ) 612 )
441} 613}
442 614
443sub _draw { 615sub _draw {
444 my ($self) = @_; 616 my ($self) = @_;
445 617
618 my $color = $FOCUS == $self && $self->{active_bg}
619 ? $self->{active_bg}
620 : $self->{bg};
621
622 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 623 my ($w, $h) = @$self{qw(w h)};
447 624
448 glEnable GL_BLEND; 625 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 627 glColor @$color;
451 628
452 glBegin GL_QUADS; 629 glBegin GL_QUADS;
453 glVertex 0 , 0; 630 glVertex 0 , 0;
454 glVertex 0 , $h; 631 glVertex 0 , $h;
455 glVertex $w, $h; 632 glVertex $w, $h;
456 glVertex $w, 0; 633 glVertex $w, 0;
457 glEnd; 634 glEnd;
458 635
459 glDisable GL_BLEND; 636 glDisable GL_BLEND;
637 }
460} 638}
461 639
462############################################################################# 640#############################################################################
463 641
464package CFClient::UI::Empty; 642package CFClient::UI::Empty;
… …
469 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
471} 649}
472 650
473sub size_request { 651sub size_request {
474 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
475} 655}
476 656
477sub draw { } 657sub draw { }
478 658
479############################################################################# 659#############################################################################
… …
508 $self->{children} = [ 688 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
511 ]; 691 ];
512 692
513 $self->check_size; 693 $self->realloc;
514 $self->update;
515} 694}
516 695
517sub children { 696sub children {
518 @{ $_[0]{children} } 697 @{ $_[0]{children} }
519} 698}
… …
524 delete $child->{parent}; 703 delete $child->{parent};
525 $child->hide; 704 $child->hide;
526 705
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 707
529 $self->check_size; 708 $self->realloc;
530 $self->update;
531} 709}
532 710
533sub clear { 711sub clear {
534 my ($self) = @_; 712 my ($self) = @_;
535 713
… …
539 for (@$children) { 717 for (@$children) {
540 delete $_->{parent}; 718 delete $_->{parent};
541 $_->hide; 719 $_->hide;
542 } 720 }
543 721
544 $self->check_size; 722 $self->realloc;
545 $self->update;
546} 723}
547 724
548sub find_widget { 725sub find_widget {
549 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
550 727
… …
625} 802}
626 803
627sub update { 804sub update {
628 my ($self) = @_; 805 my ($self) = @_;
629 806
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 807 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 808 $self->SUPER::update;
632} 809}
633 810
634sub size_allocate { 811sub size_allocate {
635 my ($self, $w, $h) = @_; 812 my ($self, $w, $h) = @_;
… …
637 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 815 $self->update;
639} 816}
640 817
641sub _render { 818sub _render {
819 my ($self) = @_;
820
642 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
643} 822}
644 823
645sub render_child { 824sub render_child {
646 my ($self) = @_; 825 my ($self) = @_;
647 826
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
651 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
652 $self->_render; 838 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 839 };
661} 840}
662 841
663sub _draw { 842sub _draw {
664 my ($self) = @_; 843 my ($self) = @_;
665 844
666 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
667 846
668 my $tex = $self->{texture} 847 my $tex = $self->{texture}
669 or return; 848 or return;
670 849
671 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 852 glColor 1, 1, 1, 1;
674 853
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 855
677 glDisable GL_TEXTURE_2D; 856 glDisable GL_TEXTURE_2D;
678} 857}
… …
681 860
682package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
683 862
684our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
685 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
686sub size_request { 875sub size_request {
687 my ($self) = @_; 876 my ($self) = @_;
688 877
689 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
691 879
692 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
693} 884}
694 885
695sub size_allocate { 886sub size_allocate {
696 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
697 888
889 my $child = $self->child;
890
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893
894 $self->child->configure (0, 0, $w, $h);
698 $self->update; 895 $self->update;
699} 896}
700 897
701sub set_offset { 898sub set_offset {
702 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
736} 933}
737 934
738sub _render { 935sub _render {
739 my ($self) = @_; 936 my ($self) = @_;
740 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
741 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
742 942
743 $self->SUPER::_render; 943 $self->SUPER::_render;
744} 944}
745 945
… …
753 my $class = shift; 953 my $class = shift;
754 954
755 my $self; 955 my $self;
756 956
757 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
758 vertical => 1, 958 vertical => 1,
759 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
760 connect_changed => sub { 960 on_changed => sub {
761 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
762 }, 962 },
763 ; 963 ;
764 964
765 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 966 vp => (new CFClient::UI::ViewPort expand => 1),
767 slider => $slider, 967 slider => $slider,
768 @_, 968 @_,
769 ); 969 );
770 970
771 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
… …
773 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
774 974
775 $self 975 $self
776} 976}
777 977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986}
987
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 $self->SUPER::size_allocate ($w, $h);
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
995}
996
778#TODO# update range on size_allocate depeneing on child 997#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 998# update viewport offset on scroll
780 999
781############################################################################# 1000#############################################################################
782 1001
783package CFClient::UI::Frame; 1002package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 1006use CFClient::OpenGL;
788 1007
789sub new { 1008sub new {
790 my $class = shift; 1009 my $class = shift;
791 1010
1011 $class->SUPER::new (
1012 bg => undef,
1013 @_,
1014 )
1015}
1016
1017sub _draw {
1018 my ($self) = @_;
1019
1020 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)};
1022
1023 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} };
1026
1027 glBegin GL_QUADS;
1028 glVertex 0 , 0;
1029 glVertex 0 , $h;
1030 glVertex $w, $h;
1031 glVertex $w, 0;
1032 glEnd;
1033
1034 glDisable GL_BLEND;
1035 }
1036
1037 $self->SUPER::_draw;
1038}
1039
1040#############################################################################
1041
1042package CFClient::UI::FancyFrame;
1043
1044our @ISA = CFClient::UI::Bin::;
1045
1046use CFClient::OpenGL;
1047
1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1055
1056sub new {
1057 my ($class, %arg) = @_;
1058
1059 my $title = delete $arg{title};
1060
792 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
793 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
794 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
795 border => 0.8, 1064 border => 0.6,
796 @_ 1065 can_events => 1,
1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
797 ); 1069 );
798 1070
799 $self
800}
801
802sub _draw {
803 my ($self) = @_;
804
805 my ($w, $h) = ($self->{w}, $self->{h});
806
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811
812# glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0;
815# glVertex 0 , $h;
816# glVertex $w, $h;
817# glVertex $w, 0;
818# glEnd;
819
820
821 $self->child->draw;
822 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D;
824}
825
826#############################################################################
827
828package CFClient::UI::FancyFrame;
829
830our @ISA = CFClient::UI::Bin::;
831
832use CFClient::OpenGL;
833
834my @tex =
835 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
836 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
837
838sub new {
839 my $class = shift;
840
841 # TODO: user_x, user_y, overwrite moveto?
842
843 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1],
846 border => 0.6,
847 can_events => 1,
848 @_
849 );
850
851 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
852 align => 0, 1072 align => 0,
853 valign => 1, 1073 valign => 1,
854 text => $self->{title}, 1074 text => $title,
855 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
856 1077
857 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
858} 1086}
859 1087
860sub border { 1088sub border {
861 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
862} 1090}
863 1091
864sub size_request { 1092sub size_request {
865 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
866 1097
867 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
868 1099
869 ( 1100 (
870 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
873} 1104}
874 1105
875sub size_allocate { 1106sub size_allocate {
876 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
877 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
878 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
880 1119
881 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
882 if $self->{title};
883
884 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
885} 1121}
886 1122
887sub button_down { 1123sub button_down {
888 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
889 1125
… …
905 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
906 1142
907 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
908 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
909 1145
910 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
911 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
912 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
913 $self->check_size;
914 }; 1151 };
915 1152
916 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
917 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
918 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
920 $self->{motion} = sub { 1157 $self->{motion} = sub {
921 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
922 1159
923 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
924 1161
925 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
926 $self->update;
927 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
928 } 1168 1
929} 1169}
930 1170
931sub button_up { 1171sub button_up {
932 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
933 1173
934 delete $self->{motion}; 1174 !!delete $self->{motion}
935} 1175}
936 1176
937sub mouse_motion { 1177sub mouse_motion {
938 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
939 1179
940 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
941} 1183}
942 1184
943sub _draw { 1185sub _draw {
944 my ($self) = @_; 1186 my ($self) = @_;
945 1187
1188 my $child = $self->{children}[0];
1189
946 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
948 1192
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 1195
954 my $border = $self->border; 1196 my $border = $self->border;
955 1197
956 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
961 1203
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
964 1206
965 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
966 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
967 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
968
969 glColor @{ $self->{bg} };
970
971 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1212 }
975 1213
976 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1215
980 $self->{title}->draw if $self->{title};
981
982 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
983} 1222}
984 1223
985############################################################################# 1224#############################################################################
986 1225
987package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
995sub new { 1234sub new {
996 my $class = shift; 1235 my $class = shift;
997 1236
998 $class->SUPER::new ( 1237 $class->SUPER::new (
999 col_expand => [], 1238 col_expand => [],
1000 @_ 1239 @_,
1001 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1002} 1245}
1003 1246
1004sub add { 1247sub add {
1005 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1006 1249
1007 $child->set_parent ($self); 1250 $child->set_parent ($self);
1008 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1009 1252
1010 $child->check_size; 1253 $self->realloc;
1011} 1254}
1012 1255
1013sub children {
1014 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1015}
1016
1017# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1018sub clear { 1257sub clear {
1019 my ($self) = @_; 1258 my ($self) = @_;
1020 1259
1021 my @children = $self->children; 1260 my @children = $self->children;
1022 delete $self->{children}; 1261 delete $self->{children};
… …
1024 for (@children) { 1263 for (@children) {
1025 delete $_->{parent}; 1264 delete $_->{parent};
1026 $_->hide; 1265 $_->hide;
1027 } 1266 }
1028 1267
1029 $self->update; 1268 $self->realloc;
1030} 1269}
1031 1270
1032sub get_wh { 1271sub get_wh {
1033 my ($self) = @_; 1272 my ($self) = @_;
1034 1273
… …
1065sub size_allocate { 1304sub size_allocate {
1066 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1067 1306
1068 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1069 1308
1070 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1071 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1072 1311
1073 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1074 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1075 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1076 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1130 } 1369 }
1131} 1370}
1132 1371
1133############################################################################# 1372#############################################################################
1134 1373
1135package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1136
1137# TODO: wrap into common Box base class
1138 1375
1139our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1140 1377
1141sub size_request { 1378sub size_request {
1142 my ($self) = @_; 1379 my ($self) = @_;
1143 1380
1144 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1145 1382 ? (
1146 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1147 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1148 (List::Util::max map $_->[1], @alloc), 1385 )
1149 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1150} 1390}
1151 1391
1152sub size_allocate { 1392sub size_allocate {
1153 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1154 1394
1155 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1156
1157 my $children = $self->{children}; 1396 my $children = $self->{children};
1158 1397
1159 my @h = map $_->{req_w}, @$children; 1398 my @req;
1160 1399
1161 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1162 1401 @req = ($space / (@$children || 1)) x @$children;
1163 if ($req_h > $h) {
1164 # ah well, not enough space
1165 $_ *= $h / $req_h for @h;
1166 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1167 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1168 $exp ||= 1;
1169 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1170 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1171 my $child = $children->[$_];
1172
1173 my $alloc_h = $h[$_];
1174 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1175 $h[$_] = $alloc_h;
1176 } 1416 }
1177 } 1417 }
1178 1418
1179 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1180 1420
1181 my $y = 0; 1421 my $pos = 0;
1182 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1183 my $child = $children->[$_];
1184 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1185 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1186 1425
1187 $y += $h; 1426 $pos += $alloc;
1188 } 1427 }
1189 1428
1190 1 1429 1
1191} 1430}
1192 1431
1193############################################################################# 1432#############################################################################
1194 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1195package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1196 1450
1197# TODO: wrap into common Box base class
1198
1199our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1200 1452
1201sub size_request { 1453sub new {
1202 my ($self) = @_; 1454 my $class = shift;
1203 1455
1204 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1205 1457 vertical => 1,
1206 ( 1458 @_,
1207 (List::Util::max map $_->[0], @alloc),
1208 (List::Util::sum map $_->[1], @alloc),
1209 ) 1459 )
1210} 1460}
1211 1461
1212sub size_allocate {
1213 my ($self, $w, $h) = @_;
1214
1215 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1216
1217 my $children = $self->{children};
1218
1219 my @h = map $_->{req_h}, @$children;
1220
1221 my $req_h = List::Util::sum @h;
1222
1223 if ($req_h > $h) {
1224 # ah well, not enough space
1225 $_ *= $h / $req_h for @h;
1226 } else {
1227 my $exp = List::Util::sum map $_->{expand}, @$children;
1228 $exp ||= 1;
1229
1230 for (0 .. $#$children) {
1231 my $child = $children->[$_];
1232
1233 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1234 }
1235 }
1236
1237 CFClient::UI::harmonize \@h;
1238
1239 my $y = 0;
1240 for (0 .. $#$children) {
1241 my $child = $children->[$_];
1242 my $h = $h[$_];
1243 $child->configure (0, $y, $w, $h);
1244
1245 $y += $h;
1246 }
1247
1248 1
1249}
1250
1251############################################################################# 1462#############################################################################
1252 1463
1253package CFClient::UI::Label; 1464package CFClient::UI::Label;
1254 1465
1255our @ISA = CFClient::UI::Base::; 1466our @ISA = CFClient::UI::DrawBG::;
1256 1467
1257use CFClient::OpenGL; 1468use CFClient::OpenGL;
1258 1469
1259sub new { 1470sub new {
1260 my ($class, %arg) = @_; 1471 my ($class, %arg) = @_;
1261 1472
1262 my $self = $class->SUPER::new ( 1473 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1474 fg => [1, 1, 1],
1475 #bg => none
1476 #active_bg => none
1264 #font => default_font 1477 #font => default_font
1265 #text => initial text 1478 #text => initial text
1266 #markup => initial narkup 1479 #markup => initial narkup
1480 #max_w => maximum pixel width
1481 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1268 fontsize => 1, 1483 fontsize => 1,
1269 align => -1, 1484 align => -1,
1270 valign => -1, 1485 valign => -1,
1271 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1272 can_events => 0, 1488 can_events => 0,
1273 %arg 1489 %arg
1274 ); 1490 );
1275 1491
1276 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1286 } 1502 }
1287 1503
1288 $self 1504 $self
1289} 1505}
1290 1506
1291sub escape { 1507sub escape($) {
1292 local $_ = $_[1]; 1508 local $_ = $_[0];
1293 1509
1294 s/&/&amp;/g; 1510 s/&/&amp;/g;
1295 s/>/&gt;/g; 1511 s/>/&gt;/g;
1296 s/</&lt;/g; 1512 s/</&lt;/g;
1297 1513
1298 $_[1] 1514 $_
1299} 1515}
1300 1516
1301sub update { 1517sub update {
1302 my ($self) = @_; 1518 my ($self) = @_;
1303 1519
… …
1312 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1313 1529
1314 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1315 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1316 1532
1533 $self->realloc;
1317 $self->update; 1534 $self->update;
1318 $self->check_size;
1319} 1535}
1320 1536
1321sub set_markup { 1537sub set_markup {
1322 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1323 1539
… …
1327 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1328 1544
1329 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1330 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1331 1547
1548 $self->realloc;
1332 $self->update; 1549 $self->update;
1333 $self->check_size;
1334} 1550}
1335 1551
1336sub size_request { 1552sub size_request {
1337 my ($self) = @_; 1553 my ($self) = @_;
1338 1554
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1555 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $self->{layout}->set_width ($self->{max_w} || -1); 1556 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1560
1343 my ($w, $h) = $self->{layout}->size; 1561 my ($w, $h) = $self->{layout}->size;
1344 1562
1345 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1350 1568
1351 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1352 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1353 } 1571 }
1354 1572
1355 ( 1573 ($w, $h)
1356 $w + $self->{padding} * 2,
1357 $h + $self->{padding} * 2,
1358 )
1359} 1574}
1360 1575
1361sub size_allocate { 1576sub size_allocate {
1362 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1363 1578
1579 delete $self->{ox};
1580
1364 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1365} 1583}
1366 1584
1367sub set_fontsize { 1585sub set_fontsize {
1368 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1369 1587
1370 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1371 delete $self->{texture}; 1589 delete $self->{texture};
1372 1590
1373 $self->update; 1591 $self->realloc;
1374 $self->check_size;
1375} 1592}
1376 1593
1377sub _draw { 1594sub _draw {
1378 my ($self) = @_; 1595 my ($self) = @_;
1596
1597 $self->SUPER::_draw; # draw background, if applicable
1379 1598
1380 my $tex = $self->{texture} ||= do { 1599 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1600 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1601 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1606
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1387 1609
1610 unless (exists $self->{ox}) {
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1613 : ($self->{w} - $tex->{w}) * 0.5);
1391 1614
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1617 : ($self->{h} - $tex->{h}) * 0.5);
1395
1396 $tex
1397 }; 1618 };
1398 1619
1399 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1401 1622
… …
1427 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1428 can_hover => 1, 1649 can_hover => 1,
1429 can_focus => 1, 1650 can_focus => 1,
1430 valign => 0, 1651 valign => 0,
1431 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1432 @_ 1654 @_
1433 ) 1655 )
1434} 1656}
1435 1657
1436sub _set_text { 1658sub _set_text {
… …
1446 $self->{text} = $text; 1668 $self->{text} = $text;
1447 1669
1448 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1449 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1450 1672
1451 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1452} 1674}
1453 1675
1454sub set_text { 1676sub set_text {
1455 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1456 1678
1457 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1680 $self->_set_text ($text);
1459 $self->check_size; 1681
1460 $self->update; 1682 $self->realloc;
1461} 1683}
1462 1684
1463sub get_text { 1685sub get_text {
1464 $_[0]{text} 1686 $_[0]{text}
1465} 1687}
… …
1468 my ($self) = @_; 1690 my ($self) = @_;
1469 1691
1470 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1471 1693
1472 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1473}
1474
1475sub size_allocate {
1476 my ($self, $w, $h) = @_;
1477
1478 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1479} 1695}
1480 1696
1481sub key_down { 1697sub key_down {
1482 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1483 1699
… …
1485 my $sym = $ev->{sym}; 1701 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1702 my $uni = $ev->{unicode};
1487 1703
1488 my $text = $self->get_text; 1704 my $text = $self->get_text;
1489 1705
1490 if ($sym == 8) { 1706 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1707 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1708 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1709 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1710 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1711 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1712 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1713 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1718 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1719 $self->_emit ('escape');
1504 } elsif ($uni) { 1720 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1506 } 1724 }
1507 1725
1508 $self->_set_text ($text); 1726 $self->_set_text ($text);
1509 $self->update; 1727
1728 $self->realloc;
1729
1730 1
1510} 1731}
1511 1732
1512sub focus_in { 1733sub focus_in {
1513 my ($self) = @_; 1734 my ($self) = @_;
1514 1735
… …
1529 utf8::encode $text; 1750 utf8::encode $text;
1530 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1531 1752
1532 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1533 $self->update; 1754 $self->update;
1755
1756 1
1534} 1757}
1535 1758
1536sub mouse_motion { 1759sub mouse_motion {
1537 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1538# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1539} 1764}
1540 1765
1541sub _draw { 1766sub _draw {
1542 my ($self) = @_; 1767 my ($self) = @_;
1543 1768
… …
1594 if ($sym == 13) { 1819 if ($sym == 13) {
1595 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1596 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1597 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1598 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1599 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1600 $self->update; 1825 $self->update;
1601 1826
1602 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1603 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1604 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1620 } else { 1845 } else {
1621 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1622 } 1847 }
1623 1848
1624 } else { 1849 } else {
1625 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1626 } 1853 1
1627
1628} 1854}
1629 1855
1630############################################################################# 1856#############################################################################
1631 1857
1632package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1641 1867
1642sub new { 1868sub new {
1643 my $class = shift; 1869 my $class = shift;
1644 1870
1645 $class->SUPER::new ( 1871 $class->SUPER::new (
1646 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1647 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1650 can_hover => 1, 1876 can_hover => 1,
1651 align => 0, 1877 align => 0,
1652 valign => 0, 1878 valign => 0,
1653 can_events => 1, 1879 can_events => 1,
1654 @_ 1880 @_
1655 ) 1881 )
1656} 1882}
1657 1883
1884sub activate { }
1885
1658sub button_up { 1886sub button_up {
1659 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1660 1888
1889 $self->emit ("activate")
1661 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1662 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1663 $self->emit ("activate"); 1892
1664 } 1893 1
1665} 1894}
1666 1895
1667sub _draw { 1896sub _draw {
1668 my ($self) = @_; 1897 my ($self) = @_;
1669 1898
… …
1698 1927
1699sub new { 1928sub new {
1700 my $class = shift; 1929 my $class = shift;
1701 1930
1702 $class->SUPER::new ( 1931 $class->SUPER::new (
1703 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1704 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1705 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1936 bg => [0, 0, 0, 0.2],
1937 active_bg => [1, 1, 1, 0.5],
1706 state => 0, 1938 state => 0,
1707 can_hover => 1, 1939 can_hover => 1,
1708 @_ 1940 @_
1709 ) 1941 )
1710} 1942}
1711 1943
1712sub size_request { 1944sub size_request {
1713 my ($self) = @_; 1945 my ($self) = @_;
1714 1946
1715 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1716} 1948}
1717 1949
1718sub button_down { 1950sub button_down {
1719 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1720 1952
1721 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1722 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1723 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1724 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1725 } 1961 1
1726} 1962}
1727 1963
1728sub _draw { 1964sub _draw {
1729 my ($self) = @_; 1965 my ($self) = @_;
1730 1966
1731 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1732 1968
1733 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1734 1970
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1736 1974
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1976
1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1978
1739 glEnable GL_TEXTURE_2D; 1979 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1980 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1746} 1982}
1747 1983
1748############################################################################# 1984#############################################################################
1749 1985
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2232 qw(s1_slider.png s1_slider_bg.png);
1997 2233
1998sub new { 2234sub new {
1999 my $class = shift; 2235 my $class = shift;
2000 2236
2001 # range [value, low, high, page] 2237 # range [value, low, high, page, unit]
2002 2238
2003 # TODO: 0-width page 2239 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2240 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2241 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2008 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2245 bg => [0, 0, 0, 0.2],
2246 active_bg => [1, 1, 1, 0.5],
2009 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2010 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2012 vertical => 0, 2250 vertical => 0,
2013 can_hover => 1, 2251 can_hover => 1,
2014 inner_pad => 5, 2252 inner_pad => 0.02,
2015 @_ 2253 @_
2016 ); 2254 );
2017 2255
2256 $self->set_value ($self->{range}[0]);
2257 $self->update;
2258
2018 $self 2259 $self
2019} 2260}
2020 2261
2262sub changed { }
2263
2264sub set_range {
2265 my ($self, $range) = @_;
2266
2267 ($range, $self->{range}) = ($self->{range}, $range);
2268
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2271}
2272
2273sub set_value {
2274 my ($self, $value) = @_;
2275
2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2277
2278 $hi = $lo + 1 if $hi <= $lo;
2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2282 $value = $lo if $value < $lo;
2283 $value = $hi - $page if $value > $hi - $page;
2284
2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2286 if $unit;
2287
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289
2290 if ($value != $old_value) {
2291 $self->_emit (changed => $value);
2292 $self->update;
2293 }
2294}
2295
2021sub size_request { 2296sub size_request {
2022 my ($self) = @_; 2297 my ($self) = @_;
2023 2298
2024 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2025 my $h = $self->{req_h};
2026
2027 $self->{vertical} ? ($h, $w) : ($w, $h)
2028} 2300}
2029 2301
2030sub button_down { 2302sub button_down {
2031 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2032 2304
2033 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2306
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308
2034 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2035} 2310}
2036 2311
2037sub mouse_motion { 2312sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2039 2314
2040 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317
2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2319
2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2321
2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2327 1
2328}
2329
2330sub update {
2331 my ($self) = @_;
2332
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2334 $self->set_value ($self->{range}[0]);
2335
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2042 2338
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2044 2340
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2047 2343
2048 $x -= $inner_pad_px; # substract the padding 2344 $value = ($value - $lo) / $range;
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2345 $value = $value * $self->{scale} + $self->{offset};
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2346
2054 $self->emit (changed => $x); 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2055 $self->update; 2348 $self->{knob_w} = $knob_w;
2056 } 2349 });
2057}
2058 2350
2059# the inner_* stuff is for generating a padding for the slider handle, 2351 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2352}
2066 2353
2067sub _draw { 2354sub _draw {
2068 my ($self) = @_; 2355 my ($self) = @_;
2069 2356
2070 $self->SUPER::_draw (); 2357 $self->SUPER::_draw ();
2071 2358
2072 my ($w, $h) = @$self{qw(w h)}; 2359 glScale $self->{w}, $self->{h};
2073 2360
2074 if ($self->{vertical}) { 2361 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2362 # draw a vertical slider like a rotated horizontal slider
2076 2363
2364 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2365 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2366 }
2082 2367
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2368 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2369 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2370
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2371 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2373
2107 # draw background 2374 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2375 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2376
2110 # draw handle 2377 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2378 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2379
2113 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2114} 2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::ValSlider;
2386
2387our @ISA = CFClient::UI::HBox::;
2388
2389sub new {
2390 my ($class, %arg) = @_;
2391
2392 my $range = delete $arg{range};
2393
2394 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift },
2398 from_value => sub { shift },
2399 %arg,
2400 );
2401
2402 $self->{slider}->connect (changed => sub {
2403 my ($self, $value) = @_;
2404 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2405 $self->{parent}->emit (changed => $value);
2406 });
2407
2408# $self->{entry}->connect (changed => sub {
2409# my ($self, $value) = @_;
2410# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2411# $self->{parent}->emit (changed => $value);
2412# });
2413
2414 $self->add ($self->{slider}, $self->{entry});
2415
2416 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2417
2418 $self
2419}
2420
2421sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) }
2115 2423
2116############################################################################# 2424#############################################################################
2117 2425
2118package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2119 2427
… …
2149 2457
2150 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2459 $self->reflow;
2152} 2460}
2153 2461
2154sub text_height {
2155 my ($self, $text) = @_;
2156
2157 my $layout = $self->{layout};
2158
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w});
2161 $layout->set_markup ($text);
2162
2163 ($layout->size)[1]
2164}
2165
2166sub reflow {
2167 my ($self) = @_;
2168
2169 $self->{need_reflow}++;
2170 $self->update;
2171}
2172
2173sub size_allocate { 2462sub size_allocate {
2174 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2175 2464
2176 $self->SUPER::size_allocate ($w, $h); 2465 $self->SUPER::size_allocate ($w, $h);
2177 2466
… …
2180 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2181 2470
2182 $self->reflow; 2471 $self->reflow;
2183} 2472}
2184 2473
2474sub text_size {
2475 my ($self, $text, $indent) = @_;
2476
2477 my $layout = $self->{layout};
2478
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2481 $layout->set_markup ($text);
2482
2483 $layout->size
2484}
2485
2486sub reflow {
2487 my ($self) = @_;
2488
2489 $self->{need_reflow}++;
2490 $self->update;
2491}
2492
2493sub set_offset {
2494 my ($self, $offset) = @_;
2495
2496 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset);
2498}
2499
2500sub clear {
2501 my ($self) = @_;
2502
2503 $self->{par} = [];
2504 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506}
2507
2185sub add_paragraph { 2508sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2187 2510
2188 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2189 2512 my ($w, $h) = $self->text_size ($line);
2190 my $height = $self->text_height ($text);
2191
2192 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2193 2516
2194 push @{$self->{par}}, [$height, $color, $text];
2195
2196 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2197 $self->{children}[1]->update;
2198} 2518}
2199 2519
2200sub update { 2520sub update {
2201 my ($self) = @_; 2521 my ($self) = @_;
2202 2522
… …
2204 2524
2205 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2206 2526
2207 delete $self->{texture}; 2527 delete $self->{texture};
2208 2528
2209 $ROOT->on_refresh ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2210 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2533 my $height = 0;
2212 2534
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2214 for @{$self->{par}}; 2539 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h;
2546 }
2547
2548 $height += $_->[1];
2549 }
2215 2550
2216 $self->{height} = $height; 2551 $self->{height} = $height;
2217 2552
2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2219 2554
2220 delete $self->{texture}; 2555 delete $self->{texture};
2221 } 2556 }
2222 2557
2223 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2224 glClearColor 0, 0, 0, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2226 2561
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229
2230 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2231 2563
2232 my $y0 = $top; 2564 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2234 2566
2235 my $y = 0; 2567 my $y = 0;
2236 2568
2237 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2238 2570
2239 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2240 2572
2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2576
2241 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2578 my $h = $par->[1];
2243 2579
2244 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2246 $layout->set_markup ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2247 2584
2248 my ($W, $H) = $layout->size; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2586
2587 glRasterPos $par->[3], $y - $y0;
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250 } 2589 }
2251 2590
2252 $y += $h; 2591 $y += $h;
2253 } 2592 }
2254 2593
2255 glDisable GL_TEXTURE_2D; 2594 glDisable GL_BLEND;
2256 }; 2595 };
2257 }); 2596 });
2258} 2597}
2259 2598
2260sub _draw { 2599sub _draw {
2261 my ($self) = @_; 2600 my ($self) = @_;
2262 2601
2263 glEnable GL_TEXTURE_2D; 2602 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2604 glColor 1, 1, 1, 1;
2266 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2267 glDisable GL_TEXTURE_2D; 2606 glDisable GL_TEXTURE_2D;
2268 2607
2269 $self->{children}[1]->draw; 2608 $self->{children}[1]->draw;
2270 2609
2271} 2610}
… …
2320 2659
2321sub new { 2660sub new {
2322 my $class = shift; 2661 my $class = shift;
2323 2662
2324 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2325 state => 0, 2664 state => 0,
2326 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2327 @_ 2666 @_
2328 ); 2667 );
2329 2668
2330 if ($self->{state}) {
2331 $self->{state} = 0;
2332 $self->toggle_flopper;
2333 }
2334
2335 $self 2669 $self
2336} 2670}
2337 2671
2338sub toggle_flopper { 2672sub toggle_flopper {
2339 my ($self) = @_; 2673 my ($self) = @_;
2340 2674
2341 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2342 if ($self->{state} = !$self->{state}) {
2343 $CFClient::UI::ROOT->add ($self->{other});
2344 $self->{other}->move ($self->coord2global (0, $self->{h}));
2345 $self->emit ("open");
2346 } else {
2347 $CFClient::UI::ROOT->remove ($self->{other});
2348 $self->emit ("close");
2349 }
2350
2351 $self->emit (changed => $self->{state});
2352} 2676}
2353 2677
2354############################################################################# 2678#############################################################################
2355 2679
2356package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2369} 2693}
2370 2694
2371sub set_tooltip_from { 2695sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2373 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2374 $self->{label} = new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2710 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2712 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2714 );
2381 $self->add ($self->{label});
2382} 2715}
2383 2716
2384sub size_request { 2717sub size_request {
2385 my ($self) = @_; 2718 my ($self) = @_;
2386 2719
… …
2393 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2394 2727
2395 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2396} 2729}
2397 2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2747}
2748
2398sub _draw { 2749sub _draw {
2399 my ($self) = @_; 2750 my ($self) = @_;
2400 2751
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2752 glTranslate 0.375, 0.375;
2403 2753
2404 my ($w, $h) = @$self{qw(w h)}; 2754 my ($w, $h) = @$self{qw(w h)};
2405 2755
2406 glColor 1, 0.8, 0.4; 2756 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2767 glVertex 0 , $h;
2418 glVertex $w, $h; 2768 glVertex $w, $h;
2419 glVertex $w, 0; 2769 glVertex $w, 0;
2420 glEnd; 2770 glEnd;
2421 2771
2422 glPopMatrix; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2423 2773
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2426} 2775}
2427 2776
2428############################################################################# 2777#############################################################################
2429 2778
… …
2434use CFClient::OpenGL; 2783use CFClient::OpenGL;
2435 2784
2436sub new { 2785sub new {
2437 my $class = shift; 2786 my $class = shift;
2438 2787
2439 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2440 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2441 @_, 2791 @_,
2442 ) 2792 );
2793
2794 if ($self->{anim} && $self->{animspeed}) {
2795 Scalar::Util::weaken (my $widget = $self);
2796
2797 $self->{timer} = Event->timer (
2798 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2799 hard => 1,
2800 interval => $self->{animspeed},
2801 cb => sub {
2802 ++$widget->{frame};
2803 $widget->update;
2804 },
2805 );
2806 }
2807
2808 $self
2443} 2809}
2444 2810
2445sub size_request { 2811sub size_request {
2446 (32, 8) 2812 (32, 8)
2447} 2813}
2448 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2449sub _draw { 2823sub _draw {
2450 my ($self) = @_; 2824 my ($self) = @_;
2451 2825
2452 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2827
2828 my $face;
2829
2830 if ($self->{frame}) {
2831 my $anim = $::CONN->{anim}[$self->{anim}];
2832
2833 $face = $anim->[ $self->{frame} % @$anim ]
2834 if $anim && @$anim;
2835 }
2836
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2838
2455 # TODO animation
2456 if ($tex) { 2839 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2462 } 2845 }
2463} 2846}
2464 2847
2465############################################################################# 2848sub DESTROY {
2466
2467package CFClient::UI::InventoryItem;
2468
2469our @ISA = CFClient::UI::HBox::;
2470
2471sub new {
2472 my $class = shift;
2473
2474 my %args = @_;
2475
2476 my $item = delete $args{item};
2477
2478 my $desc = $item->{nrof} < 2
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482
2483 my $self = $class->SUPER::new (
2484 can_hover => 1,
2485 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_;
2490
2491 # todo: maybe put examine on 1? but should just be a tooltip :(
2492 if ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507 ],
2508 )->popup ($ev);
2509 }
2510
2511 1
2512 },
2513 %args
2514 );
2515
2516 $self->add (new CFClient::UI::Face
2517 can_events => 0,
2518 face => $item->{face},
2519 anim => $item->{anim},
2520 animspeed => $item->{animspeed},
2521 );
2522
2523 $self->add (new CFClient::UI::Label
2524 can_events => 0,
2525 text => $desc,
2526 );
2527
2528 $self
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Inventory;
2534
2535our @ISA = CFClient::UI::ScrolledWindow::;
2536
2537sub new {
2538 my $class = shift;
2539
2540 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox),
2542 @_,
2543 );
2544
2545 $self
2546}
2547
2548sub set_items {
2549 my ($self, $items) = @_; 2849 my ($self) = @_;
2550 2850
2551 $self->{scrolled}->clear; 2851 $self->{timer}->cancel
2552 return unless $items; 2852 if $self->{timer};
2553 2853
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2854 $self->SUPER::DESTROY;
2555
2556 $self->{real_items} = \@items;
2557
2558 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2564 }
2565
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571 ($self->{req_w}, $self->{req_h});
2572} 2855}
2573 2856
2574############################################################################# 2857#############################################################################
2575 2858
2576package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2611 2894
2612# popup given the event (must be a mouse button down event currently) 2895# popup given the event (must be a mouse button down event currently)
2613sub popup { 2896sub popup {
2614 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2615 2898
2616 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2617 2900
2618 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2619 $GRAB = $self; 2902 $GRAB = $self;
2620 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2621 2904
2622 $self->show; 2905 $self->show;
2623 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2624} 2907}
2625 2908
2626sub mouse_motion { 2909sub mouse_motion {
2627 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2628 2911
2629 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2630 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2631 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2632} 2917}
2633 2918
2634sub button_up { 2919sub button_up {
2635 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2636 2921
2637 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2638 undef $GRAB; 2923 undef $GRAB;
2639 $self->hide; 2924 $self->hide;
2640 2925
2641 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2642 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2643 } 2932 1
2644} 2933}
2645 2934
2646############################################################################# 2935#############################################################################
2647 2936
2648package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
2649 2938
2650our @ISA = CFClient::UI::VBox::; 2939our @ISA = CFClient::UI::VBox::;
2940
2941sub new {
2942 my $class = shift;
2943
2944 $class->SUPER::new (
2945 fontsize => 0.8,
2946 @_,
2947 )
2948}
2651 2949
2652sub reorder { 2950sub reorder {
2653 my ($self) = @_; 2951 my ($self) = @_;
2654 my $NOW = time; 2952 my $NOW = time;
2655 2953
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2954 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2955 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2956 }
2659 2957
2660 my @widgets; 2958 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2959
2960 my @items = sort {
2961 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} };
2964
2662 my $count = 10 + 1; 2965 my $count = 10 + 1;
2663 for my $item (@items) { 2966 for my $item (@items) {
2664 last unless --$count; 2967 last unless --$count;
2665 2968
2666 push @widgets, $item->{label} ||= do { 2969 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2970 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2971 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text};
2974
2669 for ($short) { 2975 for ($short) {
2670 s/^\s+//; 2976 s/^\s+//;
2671 s/\012.*//s; 2977 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2978 }
2675 2979
2676 new CFClient::UI::Label 2980 new CFClient::UI::Label
2677 markup => $short, 2981 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2982 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2983 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2984 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2985 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2986 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg},
2683 can_events => 1, 2988 can_events => 1,
2684 can_hover => 1, 2989 can_hover => 1
2685 }; 2990 };
2686 } 2991 }
2687 2992
2688 $self->clear; 2993 $self->clear;
2689 $self->SUPER::add (@widgets); 2994 $self->SUPER::add (reverse @widgets);
2690} 2995}
2691 2996
2692sub add { 2997sub add {
2693 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2694 2999
2695 my $item = { 3000 $text =~ s/^\s+//;
2696 time => time, 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
3004
3005 my $timeout = time + ((delete $arg{timeout}) || 60);
3006
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008
3009 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) {
3011 $item->{count}++;
3012 } else {
3013 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text;
3015 }
3016 $item->{id} = ++$self->{id};
3017 $item->{timeout} = $timeout;
3018 delete $item->{label};
3019 } else {
3020 $self->{item}{$group} = {
3021 id => ++$self->{id},
2697 text => $text, 3022 text => $text,
2698 timeout => 60, 3023 timeout => $timeout,
2699 tooltip => $text, 3024 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 3025 fg => [0.8, 0.8, 0.8, 0.8],
3026 pri => 0,
3027 count => 1,
2702 %arg, 3028 %arg,
3029 };
2703 }; 3030 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 3031
2710 $self->reorder; 3032 $self->reorder;
2711} 3033}
2712 3034
3035sub reconfigure {
3036 my ($self) = @_;
3037
3038 delete $_->{label}
3039 for values %{ $self->{item} || {} };
3040
3041 $self->reorder;
3042 $self->SUPER::reconfigure;
3043}
3044
2713############################################################################# 3045#############################################################################
2714 3046
2715package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2716 3048
2717our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2718
2719use CFClient::OpenGL;
2720 3050
2721sub new { 3051sub new {
2722 my $class = shift; 3052 my $class = shift;
2723 3053
2724 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2725 @_, 3056 @_,
2726 ) 3057 );
2727}
2728 3058
2729sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
2730 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2731 3213
2732 $self->{w} = $w; 3214 $self->clear_command_list;
2733 $self->{h} = $h; 3215 $self->{recording} = 0;
2734} 3216 $self->{rec_btn}->set_text ("start recording");
2735 3217
2736sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
2737 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
2738 3236
2739 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2740 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2741} 3360}
2742 3361
2743sub size_request { 3362sub size_request {
2744 my ($self) = @_; 3363 my ($self) = @_;
2745 3364
2746 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
2747} 3380}
2748 3381
2749sub size_allocate { 3382sub size_allocate {
2750 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2751 3384
2752 my $old_w = $self->{old_w};
2753 my $old_h = $self->{old_h};
2754
2755 if ($old_w && $old_h) {
2756 for my $child ($self->children) {
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767
2768 for my $child ($self->children) { 3385 for my $child ($self->children) {
2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770 3387
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3388 $X = $child->{force_x} if exists $child->{force_x};
2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3390
3391 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h};
3393
2773 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2774 } 3395 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 3396}
2779 3397
2780sub coord2local { 3398sub coord2local {
2781 my ($self, $x, $y) = @_; 3399 my ($self, $x, $y) = @_;
2782 3400
… …
2790} 3408}
2791 3409
2792sub update { 3410sub update {
2793 my ($self) = @_; 3411 my ($self) = @_;
2794 3412
2795 $self->check_size;
2796 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2797} 3414}
2798 3415
2799sub add { 3416sub add {
2800 my ($self, $child) = @_; 3417 my ($self, @children) = @_;
2801 3418
2802 # integerise window positions 3419 $_->{is_toplevel} = 1
2803 $child->{x} = int $child->{x}; 3420 for @children;
2804 $child->{y} = int $child->{y};
2805 3421
2806 $self->SUPER::add ($child); 3422 $self->SUPER::add (@children);
3423}
3424
3425sub remove {
3426 my ($self, @children) = @_;
3427
3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3432
3433 while (@children) {
3434 my $w = pop @children;
3435 push @children, $w->children;
3436 $w->set_invisible;
3437 }
2807} 3438}
2808 3439
2809sub on_refresh { 3440sub on_refresh {
2810 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2811 3442
2812 $self->{refresh_hook}{$id} = $cb; 3443 $self->{refresh_hook}{$id} = $cb;
2813} 3444}
2814 3445
3446sub on_post_alloc {
3447 my ($self, $id, $cb) = @_;
3448
3449 $self->{post_alloc_hook}{$id} = $cb;
3450}
3451
2815sub draw { 3452sub draw {
2816 my ($self) = @_; 3453 my ($self) = @_;
2817
2818 if ($self->{check_size}) {
2819 my @queue = ([], []);
2820
2821 for (;;) {
2822 if ($self->{check_size}) {
2823 # heuristic: check containers last
2824 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2825 for values %{delete $self->{check_size}}
2826 }
2827
2828 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2829
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request;
2833
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836
2837 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h;
2839
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2841
2842 $widget->{parent}->check_size
2843 if $widget->{parent};
2844 }
2845 }
2846 }
2847
2848 while ($self->{size_alloc}) {
2849 for (values %{delete $self->{size_alloc}}) {
2850 my ($widget, $w, $h) = @$_;
2851
2852 $w = 0 if $w < 0;
2853 $h = 0 if $h < 0;
2854
2855 $widget->{w} = $w;
2856 $widget->{h} = $h;
2857 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h);
2859 }
2860 }
2861 3454
2862 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2863 $_->() 3456 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
2865 } 3458 }
2866 3459
3460 if ($self->{realloc}) {
3461 my %queue;
3462 my @queue;
3463 my $widget;
3464
3465 outer:
3466 while () {
3467 if (my $realloc = delete $self->{realloc}) {
3468 for $widget (values %$realloc) {
3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3475 }
3476
3477 while () {
3478 @queue or last outer;
3479
3480 $widget = pop @{ $queue[-1] || [] }
3481 and last;
3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3498 $widget->{req_w} = $w;
3499 $widget->{req_h} = $h;
3500
3501 $self->{size_alloc}{$widget+0} = $widget;
3502
3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3513 }
3514 }
3515
3516 while (my $size_alloc = delete $self->{size_alloc}) {
3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3524
3525 $w = 0 if $w < 0;
3526 $h = 0 if $h < 0;
3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3535 $widget->{w} = $w;
3536 $widget->{h} = $h;
3537
3538 $widget->emit (size_allocate => $w, $h);
3539 }
3540 }
3541 }
3542
3543 while ($self->{post_alloc_hook}) {
3544 $_->()
3545 for values %{delete $self->{post_alloc_hook}};
3546 }
3547
3548
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
2870 3552
2871 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3554 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3557 glLoadIdentity;
2876 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
2877 $self->_draw; 3566 $self->_draw;
2878} 3567}
2879 3568
2880############################################################################# 3569#############################################################################
2881 3570
2882package CFClient::UI; 3571package CFClient::UI;
2883 3572
2884$ROOT = new CFClient::UI::Root; 3573$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3574$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3575
28871 35761
2888 3577

Diff Legend

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