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

Diff Legend

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