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

Diff Legend

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