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

Diff Legend

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