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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_markup ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 38 $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 } 39 }
41 40
42 return; 41 return;
43 } 42 }
44 } 43 }
45 } 44 }
46 45
47 $TOOLTIP->hide; 46 $TOOLTIP->hide;
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
49} 71}
50 72
51# class methods for events 73# class methods for events
52sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 76 if $FOCUS;
55} 77}
56 78
57sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 81 if $FOCUS;
60} 82}
61 83
62sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
63 my ($ev) = @_; 85 my ($ev) = @_;
… …
67 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
68 90
69 $GRAB = $widget; 91 $GRAB = $widget;
70 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
71 93
72 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
73 } 95 }
74 96
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 98
77 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 101}
82 102
83sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
84 my ($ev) = @_; 104 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
86 106
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 108
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 110
91 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 113
96 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 116 $grab->update if $grab;
99 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
100 118
101 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
102 } 120 }
103} 121}
104 122
105sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
106 my ($ev) = @_; 124 my ($ev) = @_;
… …
112 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
113 131
114 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 134
117 check_tooltip; 135 $TOOLTIP_WATCHER->start;
118 } 136 }
119 137
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 139 if $HOVER;
124} 140}
125 141
126# convert position array to integers 142# convert position array to integers
127sub harmonize { 143sub harmonize {
128 my ($vals) = @_; 144 my ($vals) = @_;
… …
134 $rem += $_ - $i; 150 $rem += $_ - $i;
135 $_ = $i; 151 $_ = $i;
136 } 152 }
137} 153}
138 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
139############################################################################# 196#############################################################################
140 197
141package CFClient::UI::Base; 198package CFClient::UI::Base;
142 199
143use strict; 200use strict;
… …
146 203
147sub new { 204sub new {
148 my $class = shift; 205 my $class = shift;
149 206
150 my $self = bless { 207 my $self = bless {
151 x => 0, 208 x => "center",
152 y => 0, 209 y => "center",
153 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
154 can_events => 1, 213 can_events => 1,
155 @_ 214 @_
156 }, $class; 215 }, $class;
157 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
158 for (keys %$self) { 219 for (keys %$self) {
159 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
161 } 222 }
162 } 223 }
163 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
164 $self 237 $self
165} 238}
166 239
167sub destroy { 240sub destroy {
168 my ($self) = @_; 241 my ($self) = @_;
… …
177 return if $self->{parent}; 250 return if $self->{parent};
178 251
179 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
180} 253}
181 254
182sub hide { 255sub set_visible {
183 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
184 279
185 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
187 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
188 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
189 if $self->{parent}; 314 if $self->{parent};
190} 315}
191 316
192sub move { 317sub move_abs {
193 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
194 319
195 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
196 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
197 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
198 323
199 $self->update; 324 $self->update;
200} 325}
201 326
202sub set_size { 327sub set_size {
203 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
204 329
205 $self->{user_w} = $w; 330 $self->{force_w} = $w;
206 $self->{user_h} = $h; 331 $self->{force_h} = $h;
207 332
208 $self->check_size; 333 $self->realloc;
209} 334}
210 335
211sub size_request { 336sub size_request {
212 require Carp; 337 require Carp;
213 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
215 340
216sub configure { 341sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
218 343
219 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
222 349
223 # use alignment to adjust x, y 350 # use alignment to adjust x, y
224 351
225 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 354 }
230 355
231 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 357 $self->{x} = $x;
233 $self->{y} = $y; 358 $self->{y} = $y;
234 $self->update; 359 $self->update;
235 } 360 }
236 361
237 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
239 } 369 }
240} 370}
241 371
242sub size_allocate { 372sub size_allocate {
243 # nothing to be done 373 # nothing to be done
244} 374}
245 375
246sub children { 376sub children {
377 # nop
247} 378}
248 379
249# call when resolution changes etc. 380sub visible_children {
250sub reconfigure { 381 $_[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} 382}
260 383
261sub set_max_size { 384sub set_max_size {
262 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
263 386
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
391}
392
393sub set_tooltip {
394 my ($self, $tooltip) = @_;
395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
266} 407}
267 408
268# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
269sub coord2local { 410sub coord2local {
270 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 426 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
287 428
288 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
289 430
290 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
291 432
292 $focus->update if $focus; 433 $focus->update if $focus;
293 $FOCUS->update; 434 $FOCUS->update;
294} 435}
295 436
… …
298 439
299 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
300 441
301 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
302 443
303 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
304 445
305 $focus->update if $focus; #? 446 $focus->update if $focus; #?
306}
307 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
308sub mouse_motion { } 452sub mouse_motion { 0 }
309sub button_up { } 453sub button_up { 0 }
310sub key_down { } 454sub key_down { 0 }
311sub key_up { } 455sub key_up { 0 }
312 456
313sub button_down { 457sub button_down {
314 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
315 459
316 $self->focus_in; 460 $self->focus_in;
317}
318 461
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
323sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
324 538
325sub draw { 539sub draw {
326 my ($self) = @_; 540 my ($self) = @_;
327 541
328 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
329 553
330 glPushMatrix; 554 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 556
335 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 559 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 561 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; 562 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
359 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
360 glPopMatrix; 580 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
363} 586}
364 587
365sub _draw { 588sub _draw {
366 my ($self) = @_; 589 my ($self) = @_;
367 590
368 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
369} 592}
370 593
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 { 594sub DESTROY {
418 my ($self) = @_; 595 my ($self) = @_;
419 596
597 delete $WIDGET{$self+0};
420 #$self->deactivate; 598 #$self->deactivate;
421} 599}
422 600
423############################################################################# 601#############################################################################
424 602
… …
433 my $class = shift; 611 my $class = shift;
434 612
435 # range [value, low, high, page] 613 # range [value, low, high, page]
436 614
437 $class->SUPER::new ( 615 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
440 @_ 618 @_
441 ) 619 )
442} 620}
443 621
444sub _draw { 622sub _draw {
445 my ($self) = @_; 623 my ($self) = @_;
446 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
448 631
449 glEnable GL_BLEND; 632 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
452 635
453 glBegin GL_QUADS; 636 glBegin GL_QUADS;
454 glVertex 0 , 0; 637 glVertex 0 , 0;
455 glVertex 0 , $h; 638 glVertex 0 , $h;
456 glVertex $w, $h; 639 glVertex $w, $h;
457 glVertex $w, 0; 640 glVertex $w, 0;
458 glEnd; 641 glEnd;
459 642
460 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
461} 645}
462 646
463############################################################################# 647#############################################################################
464 648
465package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
470 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
472} 656}
473 657
474sub size_request { 658sub size_request {
475 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
476} 662}
477 663
478sub draw { } 664sub draw { }
479 665
480############################################################################# 666#############################################################################
… …
484our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
485 671
486sub new { 672sub new {
487 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
488 674
489 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
490 676
491 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
492 children => [], 678 children => [],
493 can_events => 0, 679 can_events => 0,
494 %arg, 680 %arg,
495 ); 681 );
682
496 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
497 685
498 $self 686 $self
499} 687}
500 688
501sub add { 689sub add {
… …
509 $self->{children} = [ 697 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
512 ]; 700 ];
513 701
514 $self->check_size; 702 $self->realloc;
515 $self->update;
516} 703}
517 704
518sub children { 705sub children {
519 @{ $_[0]{children} } 706 @{ $_[0]{children} }
520} 707}
… …
525 delete $child->{parent}; 712 delete $child->{parent};
526 $child->hide; 713 $child->hide;
527 714
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 716
530 $self->check_size; 717 $self->realloc;
531 $self->update;
532} 718}
533 719
534sub clear { 720sub clear {
535 my ($self) = @_; 721 my ($self) = @_;
536 722
… …
540 for (@$children) { 726 for (@$children) {
541 delete $_->{parent}; 727 delete $_->{parent};
542 $_->hide; 728 $_->hide;
543 } 729 }
544 730
545 $self->check_size; 731 $self->realloc;
546 $self->update;
547} 732}
548 733
549sub find_widget { 734sub find_widget {
550 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
551 736
552 $x -= $self->{x}; 737 $x -= $self->{x};
553 $y -= $self->{y}; 738 $y -= $self->{y};
554 739
555 my $res; 740 my $res;
556 741
557 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
558 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
559 and return $res; 744 and return $res;
560 } 745 }
561 746
562 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
611 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
612} 797}
613 798
614############################################################################# 799#############################################################################
615 800
801# back-buffered drawing area
802
616package CFClient::UI::Window; 803package CFClient::UI::Window;
617 804
618our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
619 806
620use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
626} 813}
627 814
628sub update { 815sub update {
629 my ($self) = @_; 816 my ($self) = @_;
630 817
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 819 $self->SUPER::update;
633} 820}
634 821
635sub size_allocate { 822sub size_allocate {
636 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
… …
638 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
639 $self->update; 826 $self->update;
640} 827}
641 828
642sub _render { 829sub _render {
830 my ($self) = @_;
831
643 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
644} 833}
645 834
646sub render_child { 835sub render_child {
647 my ($self) = @_; 836 my ($self) = @_;
648 837
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
652 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
653 $self->_render; 849 $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 }; 850 };
662} 851}
663 852
664sub _draw { 853sub _draw {
665 my ($self) = @_; 854 my ($self) = @_;
666 855
667 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
668 857
669 my $tex = $self->{texture} 858 my $tex = $self->{texture}
670 or return; 859 or return;
671 860
672 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
… …
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
1305 delete $self->{texture}; 1540 delete $self->{texture};
1306 $self->SUPER::update; 1541 $self->SUPER::update;
1307} 1542}
1308 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1309sub set_text { 1551sub set_text {
1310 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1311 1553
1312 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1314 1556
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1317 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1318 $self->update; 1562 $self->update;
1319 $self->check_size;
1320} 1563}
1321 1564
1322sub set_markup { 1565sub set_markup {
1323 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1324 1567
… …
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1572
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1332 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1333 $self->update; 1578 $self->update;
1334 $self->check_size;
1335} 1579}
1336 1580
1337sub size_request { 1581sub size_request {
1338 my ($self) = @_; 1582 my ($self) = @_;
1339 1583
1584 $self->{size_req} ||= do {
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1590
1344 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1345 1592
1346 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1347 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1596
1350 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1351 1598
1352 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1354 } 1604 };
1355 1605
1356 ( 1606 @{ $self->{size_req} }
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1607}
1361 1608
1362sub size_allocate { 1609sub size_allocate {
1363 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1364 1611
1612 delete $self->{ox};
1613
1365 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1366} 1616}
1367 1617
1368sub set_fontsize { 1618sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1370 1620
1371 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1372 delete $self->{texture}; 1622 delete $self->{texture};
1373 1623
1374 $self->update; 1624 $self->realloc;
1375 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1376} 1633}
1377 1634
1378sub _draw { 1635sub _draw {
1379 my ($self) = @_; 1636 my ($self) = @_;
1637
1638 $self->SUPER::_draw; # draw background, if applicable
1380 1639
1381 my $tex = $self->{texture} ||= do { 1640 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1641 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1642 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1647
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1398 }; 1649 };
1399 1650
1651 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5);
1655
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5);
1659 };
1660
1400 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1402 1662
1403 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1404 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 } 1670 }
1409 1671
1410 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1411} 1673}
… …
1428 active_fg => [0, 0, 0], 1690 active_fg => [0, 0, 0],
1429 can_hover => 1, 1691 can_hover => 1,
1430 can_focus => 1, 1692 can_focus => 1,
1431 valign => 0, 1693 valign => 0,
1432 can_events => 1, 1694 can_events => 1,
1695 #text => ...
1696 #hidden => "*",
1433 @_ 1697 @_
1434 ) 1698 )
1435} 1699}
1436 1700
1437sub _set_text { 1701sub _set_text {
… …
1439 1703
1440 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1441 1705
1442 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1443 1707
1444 delete $self->{texture};
1445
1446 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1447 $self->{text} = $text; 1709 $self->{text} = $text;
1448 1710
1449 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1451 1714
1452 $self->emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1453} 1719}
1454 1720
1455sub set_text { 1721sub set_text {
1456 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1457 1723
1458 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1725 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462} 1726}
1463 1727
1464sub get_text { 1728sub get_text {
1465 $_[0]{text} 1729 $_[0]{text}
1466} 1730}
… …
1469 my ($self) = @_; 1733 my ($self) = @_;
1470 1734
1471 my ($w, $h) = $self->SUPER::size_request; 1735 my ($w, $h) = $self->SUPER::size_request;
1472 1736
1473 ($w + 1, $h) # add 1 for cursor 1737 ($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} 1738}
1481 1739
1482sub key_down { 1740sub key_down {
1483 my ($self, $ev) = @_; 1741 my ($self, $ev) = @_;
1484 1742
… …
1486 my $sym = $ev->{sym}; 1744 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1745 my $uni = $ev->{unicode};
1488 1746
1489 my $text = $self->get_text; 1747 my $text = $self->get_text;
1490 1748
1491 if ($sym == 8) { 1749 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1751 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1752 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1753 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1754 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1755 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1756 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1757 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1758 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1759 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1761 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1762 $self->_emit ('escape');
1505 } elsif ($uni) { 1763 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1507 } 1767 }
1508 1768
1509 $self->_set_text ($text); 1769 $self->_set_text ($text);
1510 $self->update; 1770
1771 $self->realloc;
1772
1773 1
1511} 1774}
1512 1775
1513sub focus_in { 1776sub focus_in {
1514 my ($self) = @_; 1777 my ($self) = @_;
1515 1778
… …
1530 utf8::encode $text; 1793 utf8::encode $text;
1531 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1532 1795
1533 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1534 $self->update; 1797 $self->update;
1798
1799 1
1535} 1800}
1536 1801
1537sub mouse_motion { 1802sub mouse_motion {
1538 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1539# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1540} 1807}
1541 1808
1542sub _draw { 1809sub _draw {
1543 my ($self) = @_; 1810 my ($self) = @_;
1544 1811
1545 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1546 1813
1547 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1548 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1549 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1550 } else { 1817 } else {
1551 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1552 } 1819 }
1553 1820
1554 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1555 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1556 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1557 glVertex 0 , 0; 1824 glVertex 0 , 0;
1558 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1559 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1560 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1595 if ($sym == 13) { 1862 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1863 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1864 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1865 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1866 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1867 $self->_emit (activate => $txt);
1601 $self->update; 1868 $self->update;
1602 1869
1603 } elsif ($sym == CFClient::SDLK_UP) { 1870 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1871 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1872 $self->{history_saveback} = $self->get_text;
… …
1621 } else { 1888 } else {
1622 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1623 } 1890 }
1624 1891
1625 } else { 1892 } else {
1626 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1627 } 1896 1
1628
1629} 1897}
1630 1898
1631############################################################################# 1899#############################################################################
1632 1900
1633package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1642 1910
1643sub new { 1911sub new {
1644 my $class = shift; 1912 my $class = shift;
1645 1913
1646 $class->SUPER::new ( 1914 $class->SUPER::new (
1647 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1648 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1651 can_hover => 1, 1919 can_hover => 1,
1652 align => 0, 1920 align => 0,
1653 valign => 0, 1921 valign => 0,
1654 can_events => 1, 1922 can_events => 1,
1655 @_ 1923 @_
1656 ) 1924 )
1657} 1925}
1658 1926
1927sub activate { }
1928
1659sub button_up { 1929sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1661 1931
1932 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1934 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate"); 1935
1665 } 1936 1
1666} 1937}
1667 1938
1668sub _draw { 1939sub _draw {
1669 my ($self) = @_; 1940 my ($self) = @_;
1670 1941
1671 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1672 1943
1673 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg};
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1682 1947
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 1949
1685 glDisable GL_TEXTURE_2D; 1950 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 1951
1688 $self->SUPER::_draw; 1952 $self->SUPER::_draw;
1689} 1953}
1690 1954
1691############################################################################# 1955#############################################################################
… …
1702 1966
1703sub new { 1967sub new {
1704 my $class = shift; 1968 my $class = shift;
1705 1969
1706 $class->SUPER::new ( 1970 $class->SUPER::new (
1707 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1708 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1709 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1975 bg => [0, 0, 0, 0.2],
1976 active_bg => [1, 1, 1, 0.5],
1710 state => 0, 1977 state => 0,
1711 can_hover => 1, 1978 can_hover => 1,
1712 @_ 1979 @_
1713 ) 1980 )
1714} 1981}
1715 1982
1716sub size_request { 1983sub size_request {
1717 my ($self) = @_; 1984 my ($self) = @_;
1718 1985
1719 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1720} 1987}
1721 1988
1722sub button_down { 1989sub button_down {
1723 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1724 1991
1725 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1726 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1727 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1728 $self->emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1729 } 2000 1
1730} 2001}
1731 2002
1732sub _draw { 2003sub _draw {
1733 my ($self) = @_; 2004 my ($self) = @_;
1734 2005
1735 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1736 2007
1737 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1738 2009
1739 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1740 2013
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 2015
1743 glEnable GL_BLEND; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
2017
1744 glEnable GL_TEXTURE_2D; 2018 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 2019 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 2020 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 2021}
1754 2022
1755############################################################################# 2023#############################################################################
1756 2024
1757package CFClient::UI::Image; 2025package CFClient::UI::Image;
… …
1800 glTranslate 0, -$self->{w}, 0; 2068 glTranslate 0, -$self->{w}, 0;
1801 2069
1802 ($w, $h) = ($h, $w); 2070 ($w, $h) = ($h, $w);
1803 } 2071 }
1804 2072
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 2073 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 2075
1810 $tex->draw_quad (0, 0, $w, $h); 2076 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 2077
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 2078 glDisable GL_TEXTURE_2D;
1814} 2079}
1815 2080
1816############################################################################# 2081#############################################################################
1817 2082
… …
1907 2172
1908 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
1909 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
1910 2175
1911 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
1912 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1913 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
1914 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1915 2181
1916 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
1917 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2272 qw(s1_slider.png s1_slider_bg.png);
2007 2273
2008sub new { 2274sub new {
2009 my $class = shift; 2275 my $class = shift;
2010 2276
2011 # range [value, low, high, page] 2277 # range [value, low, high, page, unit]
2012 2278
2013 # TODO: 0-width page 2279 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2280 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2281 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2282 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2018 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2285 bg => [0, 0, 0, 0.2],
2286 active_bg => [1, 1, 1, 0.5],
2019 range => [0, 0, 100, 10], 2287 range => [0, 0, 100, 10, 0],
2020 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2022 vertical => 0, 2290 vertical => 0,
2023 can_hover => 1, 2291 can_hover => 1,
2024 inner_pad => 5, 2292 inner_pad => 0.02,
2025 @_ 2293 @_
2026 ); 2294 );
2027 2295
2296 $self->set_value ($self->{range}[0]);
2297 $self->update;
2298
2028 $self 2299 $self
2029} 2300}
2030 2301
2302sub changed { }
2303
2304sub set_range {
2305 my ($self, $range) = @_;
2306
2307 ($range, $self->{range}) = ($self->{range}, $range);
2308
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}";
2311}
2312
2313sub set_value {
2314 my ($self, $value) = @_;
2315
2316 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2317
2318 $hi = $lo + 1 if $hi <= $lo;
2319
2320 $page = $hi - $lo if $page > $hi - $lo;
2321
2322 $value = $lo if $value < $lo;
2323 $value = $hi - $page if $value > $hi - $page;
2324
2325 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2326 if $unit;
2327
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329
2330 if ($value != $old_value) {
2331 $self->_emit (changed => $value);
2332 $self->update;
2333 }
2334}
2335
2031sub size_request { 2336sub size_request {
2032 my ($self) = @_; 2337 my ($self) = @_;
2033 2338
2034 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2035 my $h = $self->{req_h};
2036
2037 $self->{vertical} ? ($h, $w) : ($w, $h)
2038} 2340}
2039 2341
2040sub button_down { 2342sub button_down {
2041 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2042 2344
2043 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2346
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348
2044 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2045} 2350}
2046 2351
2047sub mouse_motion { 2352sub mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2049 2354
2050 if ($GRAB == $self) { 2355 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357
2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2359
2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2361
2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2367 1
2368}
2369
2370sub update {
2371 my ($self) = @_;
2372
2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2381 $self->set_value ($self->{range}[0]);
2382
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2384 my $range = ($hi - $page - $lo) || 1e-100;
2052 2385
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2386 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054 2387
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2388 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2389 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057 2390
2058 $x -= $inner_pad_px; # substract the padding 2391 $value = ($value - $lo) / $range;
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2392 $value = $value * $self->{scale} + $self->{offset};
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2393
2064 $self->emit (changed => $x); 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2065 $self->update; 2395 $self->{knob_w} = $knob_w;
2066 } 2396 }
2067}
2068
2069# the inner_* stuff is for generating a padding for the slider handle,
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075}
2076
2077sub _draw {
2078 my ($self) = @_;
2079 2397
2080 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2081 2399
2082 my ($w, $h) = @$self{qw(w h)}; 2400 glScale $self->{w}, $self->{h};
2083 2401
2084 if ($self->{vertical}) { 2402 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2403 # draw a vertical slider like a rotated horizontal slider
2086 2404
2405 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2406 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2407 }
2092 2408
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2409 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2410 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2411
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2412 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2414
2119 # draw background 2415 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2416 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2417
2122 # draw handle 2418 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2419 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2420
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2127} 2422}
2423
2424#############################################################################
2425
2426package CFClient::UI::ValSlider;
2427
2428our @ISA = CFClient::UI::HBox::;
2429
2430sub new {
2431 my ($class, %arg) = @_;
2432
2433 my $range = delete $arg{range};
2434
2435 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift },
2439 from_value => sub { shift },
2440 %arg,
2441 );
2442
2443 $self->{slider}->connect (changed => sub {
2444 my ($self, $value) = @_;
2445 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2446 $self->{parent}->emit (changed => $value);
2447 });
2448
2449# $self->{entry}->connect (changed => sub {
2450# my ($self, $value) = @_;
2451# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2452# $self->{parent}->emit (changed => $value);
2453# });
2454
2455 $self->add ($self->{slider}, $self->{entry});
2456
2457 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2458
2459 $self
2460}
2461
2462sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) }
2128 2464
2129############################################################################# 2465#############################################################################
2130 2466
2131package CFClient::UI::TextView; 2467package CFClient::UI::TextView;
2132 2468
… …
2138 my $class = shift; 2474 my $class = shift;
2139 2475
2140 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
2141 fontsize => 1, 2477 fontsize => 1,
2142 can_events => 0, 2478 can_events => 0,
2479 indent => 0,
2143 #font => default_font 2480 #font => default_font
2144 @_, 2481 @_,
2145 2482
2146 layout => (new CFClient::Layout), 2483 layout => (new CFClient::Layout 1),
2147 par => [], 2484 par => [],
2148 height => 0, 2485 height => 0,
2149 children => [ 2486 children => [
2150 (new CFClient::UI::Empty expand => 1), 2487 (new CFClient::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2488 (new CFClient::UI::Slider vertical => 1),
… …
2162 2499
2163 $self->{fontsize} = $fontsize; 2500 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2501 $self->reflow;
2165} 2502}
2166 2503
2167sub text_height {
2168 my ($self, $text) = @_;
2169
2170 my $layout = $self->{layout};
2171
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w});
2174 $layout->set_text ($text);
2175
2176 ($layout->size)[1]
2177}
2178
2179sub reflow {
2180 my ($self) = @_;
2181
2182 $self->{need_reflow}++;
2183 $self->update;
2184}
2185
2186sub size_allocate { 2504sub size_allocate {
2187 my ($self, $w, $h) = @_; 2505 my ($self, $w, $h) = @_;
2188 2506
2189 $self->SUPER::size_allocate ($w, $h); 2507 $self->SUPER::size_allocate ($w, $h);
2190 2508
2191 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2509 $self->{layout}->set_font ($self->{font}) if $self->{font};
2192 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2511 $self->{layout}->set_width ($self->{children}[0]{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2194 2513
2195 $self->reflow; 2514 $self->reflow;
2196} 2515}
2197 2516
2517sub text_size {
2518 my ($self, $text, $indent) = @_;
2519
2520 my $layout = $self->{layout};
2521
2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2523 $layout->set_width ($self->{children}[0]{w} - $indent);
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2525 $layout->set_markup ($text);
2526
2527 $layout->size
2528}
2529
2530sub reflow {
2531 my ($self) = @_;
2532
2533 $self->{need_reflow}++;
2534 $self->update;
2535}
2536
2537sub set_offset {
2538 my ($self, $offset) = @_;
2539
2540 # todo: base offset on lines or so, not on pixels
2541 $self->{children}[1]->set_value ($offset);
2542}
2543
2544sub clear {
2545 my ($self) = @_;
2546
2547 $self->{par} = [];
2548 $self->{height} = 0;
2549 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2550}
2551
2198sub add_paragraph { 2552sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2553 my ($self, $color, $text, $indent) = @_;
2200 2554
2201 #TODO: intelligently "reformat" paragraph 2555 for my $line (split /\n/, $text) {
2202 2556 my ($w, $h) = $self->text_size ($line);
2203 my $height = $self->text_height ($text);
2204
2205 $self->{height} += $height; 2557 $self->{height} += $h;
2558 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2559 }
2206 2560
2207 push @{$self->{par}}, [$height, $color, $text];
2208
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2561 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210 $self->{children}[1]->update;
2211} 2562}
2212 2563
2213sub update { 2564sub update {
2214 my ($self) = @_; 2565 my ($self) = @_;
2215 2566
… …
2217 2568
2218 return unless $self->{h} > 0; 2569 return unless $self->{h} > 0;
2219 2570
2220 delete $self->{texture}; 2571 delete $self->{texture};
2221 2572
2222 $ROOT->on_refresh ($self, sub { 2573 $ROOT->on_post_alloc ($self, sub {
2574 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2575
2223 if (delete $self->{need_reflow}) { 2576 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2577 my $height = 0;
2225 2578
2226 $height += $_->[0] = $self->text_height ($_->[2]) 2579 my $layout = $self->{layout};
2580
2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2582
2227 for @{$self->{par}}; 2583 for (@{$self->{par}}) {
2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2587 $layout->set_markup ($_->[4]);
2588 my ($w, $h) = $layout->size;
2589 $_->[0] = $w + $_->[3];
2590 $_->[1] = $h;
2591 }
2592
2593 $height += $_->[1];
2594 }
2228 2595
2229 $self->{height} = $height; 2596 $self->{height} = $height;
2230 2597
2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2598 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232 2599
2233 delete $self->{texture}; 2600 delete $self->{texture};
2234 } 2601 }
2235 2602
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2603 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237 glClearColor 0, 0, 0, 0; 2604 glClearColor 0, 0, 0, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2605 glClear GL_COLOR_BUFFER_BIT;
2239 2606
2607 my $top = int $self->{children}[1]{range}[0];
2608
2609 my $y0 = $top;
2610 my $y1 = $top + $H;
2611
2612 my $y = 0;
2613
2614 my $layout = $self->{layout};
2615
2616 $layout->set_font ($self->{font}) if $self->{font};
2617
2240 glEnable GL_BLEND; 2618 glEnable GL_BLEND;
2619 #TODO# not correct in windows where rgba is forced off
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2620 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0];
2246
2247 my $y0 = $top;
2248 my $y1 = $top + $self->{h};
2249
2250 my $y = 0;
2251
2252 my $layout = $self->{layout};
2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255 2621
2256 for my $par (@{$self->{par}}) { 2622 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2623 my $h = $par->[1];
2258 2624
2259 if ($y0 < $y + $h && $y < $y1) { 2625 if ($y0 < $y + $h && $y < $y1) {
2626 $layout->set_foreground (@{ $par->[2] });
2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2260 $layout->set_text ($par->[2]); 2629 $layout->set_markup ($par->[4]);
2261 2630
2262 glColor @{ $par->[1] }; 2631 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 my ($W, $H) = $layout->size; 2632
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2633 glRasterPos $par->[3], $y - $y0;
2634 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2635 }
2266 2636
2267 $y += $h; 2637 $y += $h;
2268 } 2638 }
2269 2639
2270 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND; 2640 glDisable GL_BLEND;
2272 }; 2641 };
2273 }); 2642 });
2274} 2643}
2275 2644
2276sub _draw { 2645sub _draw {
2277 my ($self) = @_; 2646 my ($self) = @_;
2278 2647
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2648 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2649 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2650 glColor 0, 0, 0, 1;
2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2651 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2653
2288 $self->{children}[1]->draw; 2654 $self->{children}[1]->draw;
2289 2655
2290} 2656}
2291 2657
… …
2339 2705
2340sub new { 2706sub new {
2341 my $class = shift; 2707 my $class = shift;
2342 2708
2343 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2344 state => 0, 2710 state => 0,
2345 connect_activate => \&toggle_flopper, 2711 on_activate => \&toggle_flopper,
2346 @_ 2712 @_
2347 ); 2713 );
2348 2714
2349 if ($self->{state}) {
2350 $self->{state} = 0;
2351 $self->toggle_flopper;
2352 }
2353
2354 $self 2715 $self
2355} 2716}
2356 2717
2357sub toggle_flopper { 2718sub toggle_flopper {
2358 my ($self) = @_; 2719 my ($self) = @_;
2359 2720
2360 # TODO: use animation 2721 $self->{other}->toggle_visibility;
2361 if ($self->{state} = !$self->{state}) {
2362 $CFClient::UI::ROOT->add ($self->{other});
2363 $self->{other}->move ($self->coord2global (0, $self->{h}));
2364 $self->emit ("open");
2365 } else {
2366 $CFClient::UI::ROOT->remove ($self->{other});
2367 $self->emit ("close");
2368 }
2369
2370 $self->emit (changed => $self->{state});
2371} 2722}
2372 2723
2373############################################################################# 2724#############################################################################
2374 2725
2375package CFClient::UI::Tooltip; 2726package CFClient::UI::Tooltip;
… …
2385 @_, 2736 @_,
2386 can_events => 0, 2737 can_events => 0,
2387 ) 2738 )
2388} 2739}
2389 2740
2390sub set_markup { 2741sub set_tooltip_from {
2391 my ($self, $text) = @_; 2742 my ($self, $widget) = @_;
2392 2743
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2744 my $tooltip = $widget->{tooltip};
2394 $self->{label}->set_markup ($text); 2745
2395 $self->add ($self->{label}); 2746 if ($ENV{CFPLUS_DEBUG} & 2) {
2747 $tooltip .= "\n\n" . (ref $widget) . "\n"
2748 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2749 . "req $widget->{req_w} $widget->{req_h}\n"
2750 . "visible $widget->{visible}";
2751 }
2752
2753 $self->add (new CFClient::UI::Label
2754 markup => $tooltip,
2755 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2756 fontsize => 0.8,
2757 fg => [0, 0, 0, 1],
2758 ellipsise => 0,
2759 font => ($widget->{tooltip_font} || $::FONT_PROP),
2760 );
2396} 2761}
2397 2762
2398sub size_request { 2763sub size_request {
2399 my ($self) = @_; 2764 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402 2765
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2766 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2767
2405 ($w + 4, $h + 4) 2768 ($w + 4, $h + 4)
2406} 2769}
… …
2409 my ($self, $w, $h) = @_; 2772 my ($self, $w, $h) = @_;
2410 2773
2411 $self->SUPER::size_allocate ($w - 4, $h - 4); 2774 $self->SUPER::size_allocate ($w - 4, $h - 4);
2412} 2775}
2413 2776
2777sub visibility_change {
2778 my ($self, $visible) = @_;
2779
2780 return unless $visible;
2781
2782 $self->{root}->on_post_alloc ("move_$self" => sub {
2783 my $widget = $self->{owner}
2784 or return;
2785
2786 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2787
2788 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2789 if $x + $self->{w} > $::WIDTH;
2790
2791 $self->move_abs ($x, $y);
2792 });
2793}
2794
2414sub _draw { 2795sub _draw {
2415 my ($self) = @_; 2796 my ($self) = @_;
2416 2797
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2798 glTranslate 0.375, 0.375;
2419 2799
2420 my ($w, $h) = @$self{qw(w h)}; 2800 my ($w, $h) = @$self{qw(w h)};
2421 2801
2422 glColor 1, 0.8, 0.4; 2802 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2813 glVertex 0 , $h;
2434 glVertex $w, $h; 2814 glVertex $w, $h;
2435 glVertex $w, 0; 2815 glVertex $w, 0;
2436 glEnd; 2816 glEnd;
2437 2817
2438 glPopMatrix; 2818 glTranslate 2 - 0.375, 2 - 0.375;
2439 2819
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2820 $self->SUPER::_draw;
2442} 2821}
2443 2822
2444############################################################################# 2823#############################################################################
2445 2824
… …
2450use CFClient::OpenGL; 2829use CFClient::OpenGL;
2451 2830
2452sub new { 2831sub new {
2453 my $class = shift; 2832 my $class = shift;
2454 2833
2455 $class->SUPER::new ( 2834 my $self = $class->SUPER::new (
2456 aspect => 1, 2835 aspect => 1,
2836 can_events => 0,
2457 @_, 2837 @_,
2458 ) 2838 );
2839
2840 if ($self->{anim} && $self->{animspeed}) {
2841 Scalar::Util::weaken (my $widget = $self);
2842
2843 $self->{timer} = Event->timer (
2844 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2845 hard => 1,
2846 interval => $self->{animspeed},
2847 cb => sub {
2848 ++$widget->{frame};
2849 $widget->update;
2850 },
2851 );
2852 }
2853
2854 $self
2459} 2855}
2460 2856
2461sub size_request { 2857sub size_request {
2462 (32, 8) 2858 (32, 8)
2463} 2859}
2464 2860
2861sub update {
2862 my ($self) = @_;
2863
2864 return unless $self->{visible};
2865
2866 $self->SUPER::update;
2867}
2868
2465sub _draw { 2869sub _draw {
2466 my ($self) = @_; 2870 my ($self) = @_;
2467 2871
2468 return unless $::CONN;#d# manage and cache textures differently 2872 return unless $::CONN;
2873
2874 my $face;
2875
2876 if ($self->{frame}) {
2877 my $anim = $::CONN->{anim}[$self->{anim}];
2878
2879 $face = $anim->[ $self->{frame} % @$anim ]
2880 if $anim && @$anim;
2881 }
2882
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2883 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2884
2471 # TODO animation
2472 if ($tex) { 2885 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2886 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2888 glColor 0, 0, 0, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2889 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2890 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2891 }
2892}
2893
2894sub DESTROY {
2895 my ($self) = @_;
2896
2897 $self->{timer}->cancel
2898 if $self->{timer};
2899
2900 $self->SUPER::DESTROY;
2482} 2901}
2483 2902
2484############################################################################# 2903#############################################################################
2485 2904
2486package CFClient::UI::InventoryItem; 2905package CFClient::UI::Buttonbar;
2487 2906
2488our @ISA = CFClient::UI::HBox::; 2907our @ISA = CFClient::UI::HBox::;
2489 2908
2490sub new { 2909# TODO: should actualyl wrap buttons and other goodies.
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592 2910
2593############################################################################# 2911#############################################################################
2594 2912
2595package CFClient::UI::Menu; 2913package CFClient::UI::Menu;
2596 2914
… …
2608 ); 2926 );
2609 2927
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2928 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2611 2929
2612 for my $item (@{ $self->{items} }) { 2930 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item; 2931 my ($widget, $cb, $tooltip) = @$item;
2614 2932
2615 # handle various types of items, only text for now 2933 # handle various types of items, only text for now
2616 if (!ref $widget) { 2934 if (!ref $widget) {
2617 $widget = new CFClient::UI::Label 2935 $widget = new CFClient::UI::Label
2618 can_hover => 1, 2936 can_hover => 1,
2619 can_events => 1, 2937 can_events => 1,
2620 text => $widget; 2938 text => $widget,
2939 tooltip => $tooltip
2621 } 2940 }
2622 2941
2623 $self->{item}{$widget} = $item; 2942 $self->{item}{$widget} = $item;
2624 2943
2625 $self->{vbox}->add ($widget); 2944 $self->{vbox}->add ($widget);
… …
2630 2949
2631# popup given the event (must be a mouse button down event currently) 2950# popup given the event (must be a mouse button down event currently)
2632sub popup { 2951sub popup {
2633 my ($self, $ev) = @_; 2952 my ($self, $ev) = @_;
2634 2953
2635 $self->emit ("popdown"); 2954 $self->_emit ("popdown");
2636 2955
2637 # maybe save $GRAB? must be careful about events... 2956 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self; 2957 $GRAB = $self;
2639 $self->{button} = $ev->{button}; 2958 $self->{button} = $ev->{button};
2640 2959
2641 $self->show; 2960 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2961 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643} 2962}
2644 2963
2645sub mouse_motion { 2964sub mouse_motion {
2646 my ($self, $ev, $x, $y) = @_; 2965 my ($self, $ev, $x, $y) = @_;
2647 2966
2648 # TODO: should use vbox->find_widget or so 2967 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2968 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER}; 2969 $self->{hover} = $self->{item}{$HOVER};
2970
2971 0
2651} 2972}
2652 2973
2653sub button_up { 2974sub button_up {
2654 my ($self, $ev, $x, $y) = @_; 2975 my ($self, $ev, $x, $y) = @_;
2655 2976
2656 if ($ev->{button} == $self->{button}) { 2977 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB; 2978 undef $GRAB;
2658 $self->hide; 2979 $self->hide;
2659 2980
2660 $self->emit ("popdown"); 2981 $self->_emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover}; 2982 $self->{hover}[1]->() if $self->{hover};
2983 } else {
2984 return 0
2985 }
2986
2662 } 2987 1
2663} 2988}
2664 2989
2665############################################################################# 2990#############################################################################
2666 2991
2992package CFClient::UI::Multiplexer;
2993
2994our @ISA = CFClient::UI::Container::;
2995
2996sub new {
2997 my $class = shift;
2998
2999 my $self = $class->SUPER::new (
3000 @_,
3001 );
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005
3006 $self
3007}
3008
3009sub add {
3010 my ($self, @widgets) = @_;
3011
3012 $self->SUPER::add (@widgets);
3013
3014 $self->{current} = $self->{children}[0]
3015 if @{ $self->{children} };
3016}
3017
3018sub set_current_page {
3019 my ($self, $page_or_widget) = @_;
3020
3021 my $widget = ref $page_or_widget
3022 ? $page_or_widget
3023 : $self->{children}[$page_or_widget];
3024
3025 $self->{current} = $widget;
3026 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3027
3028 $self->_emit (page_changed => $self->{current});
3029
3030 $self->realloc;
3031}
3032
3033sub visible_children {
3034 $_[0]{current}
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 $self->{current}->size_request
3041}
3042
3043sub size_allocate {
3044 my ($self, $w, $h) = @_;
3045
3046 $self->{current}->configure (0, 0, $w, $h);
3047}
3048
3049sub _draw {
3050 my ($self) = @_;
3051
3052 $self->{current}->draw;
3053}
3054
3055#############################################################################
3056
3057package CFClient::UI::Notebook;
3058
3059our @ISA = CFClient::UI::VBox::;
3060
3061sub new {
3062 my $class = shift;
3063
3064 my $self = $class->SUPER::new (
3065 buttonbar => (new CFClient::UI::Buttonbar),
3066 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3067 # filter => # will be put between multiplexer and $self
3068 @_,
3069 );
3070
3071 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3072 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3073
3074 $self
3075}
3076
3077sub add {
3078 my ($self, $title, $widget, $tooltip) = @_;
3079
3080 Scalar::Util::weaken $self;
3081
3082 $self->{buttonbar}->add (new CFClient::UI::Button
3083 markup => $title,
3084 tooltip => $tooltip,
3085 on_activate => sub { $self->set_current_page ($widget) },
3086 );
3087
3088 $self->{multiplexer}->add ($widget);
3089}
3090
3091sub set_current_page {
3092 my ($self, $page) = @_;
3093
3094 $self->{multiplexer}->set_current_page ($page);
3095 $self->_emit (page_changed => $self->{multiplexer}{current});
3096}
3097
3098#############################################################################
3099
3100package CFClient::UI::Combobox;
3101
3102use utf8;
3103
3104our @ISA = CFClient::UI::Button::;
3105
3106sub new {
3107 my $class = shift;
3108
3109 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ...
3111 value => undef,
3112 @_,
3113 );
3114
3115 $self->_set_value ($self->{value});
3116
3117 $self
3118}
3119
3120sub button_down {
3121 my ($self, $ev) = @_;
3122
3123 my @menu_items;
3124
3125 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_;
3127
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3129 }
3130
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132}
3133
3134sub _set_value {
3135 my ($self, $value) = @_;
3136
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3138 or return;
3139
3140 $self->{value} = $item->[1];
3141 $self->set_markup ("$item->[0] ⇓");
3142 $self->set_tooltip ($item->[2]);
3143}
3144
3145sub set_value {
3146 my ($self, $value) = @_;
3147
3148 return unless $self->{value} ne $value;
3149
3150 $self->_set_value ($value);
3151 $self->_emit (changed => $value);
3152}
3153
3154#############################################################################
3155
2667package CFClient::UI::Statusbox; 3156package CFClient::UI::Statusbox;
2668 3157
2669our @ISA = CFClient::UI::VBox::; 3158our @ISA = CFClient::UI::VBox::;
2670 3159
3160sub new {
3161 my $class = shift;
3162
3163 my $self = $class->SUPER::new (
3164 fontsize => 0.8,
3165 @_,
3166 );
3167
3168 Scalar::Util::weaken (my $this = $self);
3169
3170 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3171
3172 $self
3173}
3174
2671sub reorder { 3175sub reorder {
2672 my ($self) = @_; 3176 my ($self) = @_;
2673 my $NOW = time; 3177 my $NOW = Time::HiRes::time;
3178
3179 # freeze display when hovering over any label
3180 return if $CFClient::UI::TOOLTIP->{owner}
3181 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3182 values %{ $self->{item} };
2674 3183
2675 while (my ($k, $v) = each %{ $self->{item} }) { 3184 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3185 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 3186 }
2678 3187
2679 my @widgets; 3188 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 3189
3190 my @items = sort {
3191 $a->{pri} <=> $b->{pri}
3192 or $b->{id} <=> $a->{id}
3193 } values %{ $self->{item} };
3194
3195 $self->{timer}->interval (1);
3196
2681 my $count = 10 + 1; 3197 my $count = 10 + 1;
2682 for my $item (@items) { 3198 for my $item (@items) {
2683 last unless --$count; 3199 last unless --$count;
2684 3200
2685 push @widgets, $item->{label} ||= do { 3201 my $label = $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 3202 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 3203 my $short = $item->{count} > 1
3204 ? "<b>$item->{count} ×</b> $item->{text}"
3205 : $item->{text};
3206
2688 for ($short) { 3207 for ($short) {
2689 s/^\s+//; 3208 s/^\s+//;
2690 s/\012.*//s; 3209 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 3210 }
2694 3211
2695 new CFClient::UI::Label 3212 new CFClient::UI::Label
2696 markup => $short, 3213 markup => $short,
2697 tooltip => delete $item->{tooltip}, 3214 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 3215 tooltip_font => $::FONT_PROP,
2699 color => delete $item->{color}, 3216 tooltip_width => 0.67,
3217 fontsize => $item->{fontsize} || $self->{fontsize},
3218 max_w => $::WIDTH * 0.44,
3219 fg => [@{ $item->{fg} }],
2700 can_events => 1, 3220 can_events => 1,
2701 can_hover => 1, 3221 can_hover => 1
2702 }; 3222 };
3223
3224 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3225 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3226 $label->update;
3227 $label->set_max_size (undef, $label->{req_h} * $diff)
3228 if $diff < 1;
3229 $self->{timer}->interval (1/30);
3230 } else {
3231 $label->{fg}[3] = $item->{fg}[3] || 1;
3232 }
3233
3234 push @widgets, $label;
2703 } 3235 }
2704 3236
2705 $self->clear; 3237 $self->clear;
2706 $self->SUPER::add (@widgets); 3238 $self->SUPER::add (reverse @widgets);
2707} 3239}
2708 3240
2709sub add { 3241sub add {
2710 my ($self, $text, %arg) = @_; 3242 my ($self, $text, %arg) = @_;
2711 3243
2712 my $item = { 3244 $text =~ s/^\s+//;
2713 time => time, 3245 $text =~ s/\s+$//;
3246
3247 return unless $text;
3248
3249 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3250
3251 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3252
3253 if (my $item = $self->{item}{$group}) {
3254 if ($item->{text} eq $text) {
3255 $item->{count}++;
3256 } else {
3257 $item->{count} = 1;
3258 $item->{text} = $item->{tooltip} = $text;
3259 }
3260 $item->{id} = ++$self->{id};
3261 $item->{timeout} = $timeout;
3262 delete $item->{label};
3263 } else {
3264 $self->{item}{$group} = {
3265 id => ++$self->{id},
2714 text => $text, 3266 text => $text,
2715 timeout => 60, 3267 timeout => $timeout,
2716 tooltip => $text, 3268 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 3269 fg => [0.8, 0.8, 0.8, 0.8],
3270 pri => 0,
3271 count => 1,
2719 %arg, 3272 %arg,
3273 };
2720 }; 3274 }
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726 3275
2727 $self->reorder; 3276 $self->reorder;
2728} 3277}
2729 3278
3279sub reconfigure {
3280 my ($self) = @_;
3281
3282 delete $_->{label}
3283 for values %{ $self->{item} || {} };
3284
3285 $self->reorder;
3286 $self->SUPER::reconfigure;
3287}
3288
3289sub DESTROY {
3290 my ($self) = @_;
3291
3292 $self->{timer}->cancel;
3293
3294 $self->SUPER::DESTROY;
3295}
3296
2730############################################################################# 3297#############################################################################
2731 3298
2732package CFClient::UI::Root; 3299package CFClient::UI::Inventory;
2733 3300
2734our @ISA = CFClient::UI::Container::; 3301our @ISA = CFClient::UI::ScrolledWindow::;
2735
2736use CFClient::OpenGL;
2737 3302
2738sub new { 3303sub new {
2739 my $class = shift; 3304 my $class = shift;
2740 3305
2741 $class->SUPER::new ( 3306 my $self = $class->SUPER::new (
3307 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3308 @_,
3309 );
3310
3311 $self
3312}
3313
3314sub set_items {
3315 my ($self, $items) = @_;
3316
3317 $self->{child}->clear;
3318 return unless $items;
3319
3320 my @items = sort {
3321 ($a->{type} <=> $b->{type})
3322 or ($a->{name} cmp $b->{name})
3323 } @$items;
3324
3325 $self->{real_items} = \@items;
3326
3327 my $row = 0;
3328 for my $item (@items) {
3329 CFClient::Item::update_widgets $item;
3330
3331 $self->{child}->add (0, $row, $item->{face_widget});
3332 $self->{child}->add (1, $row, $item->{desc_widget});
3333 $self->{child}->add (2, $row, $item->{weight_widget});
3334
3335 $row++;
3336 }
3337}
3338
3339#############################################################################
3340
3341package CFClient::UI::BindEditor;
3342
3343our @ISA = CFClient::UI::FancyFrame::;
3344
3345sub new {
3346 my $class = shift;
3347
3348 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3349
3350 $self->add (my $vb = new CFClient::UI::VBox);
3351
3352
3353 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3354 text => "start recording",
3355 tooltip => "Start/Stops recording of actions."
3356 ."All subsequent actions after the recording started will be captured."
3357 ."The actions are displayed after the record was stopped."
3358 ."To bind the action you have to click on the 'Bind' button",
3359 on_activate => sub {
3360 unless ($self->{recording}) {
3361 $self->start;
3362 } else {
3363 $self->stop;
3364 }
3365 });
3366
3367 $vb->add (new CFClient::UI::Label text => "Actions:");
3368 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3369
3370 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3371 $vb->add (my $hb = new CFClient::UI::HBox);
3372 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3373 $hb->add (new CFClient::UI::Button
3374 text => "bind",
3375 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3376 on_activate => sub {
3377 $self->ask_for_bind;
3378 });
3379
3380 $vb->add (my $hb = new CFClient::UI::HBox);
3381 $hb->add (new CFClient::UI::Button
3382 text => "ok",
3383 expand => 1,
3384 tooltip => "This closes the binding editor and saves the binding",
3385 on_activate => sub {
3386 $self->hide;
3387 $self->commit;
3388 });
3389
3390 $hb->add (new CFClient::UI::Button
3391 text => "cancel",
3392 expand => 1,
3393 tooltip => "This closes the binding editor without saving",
3394 on_activate => sub {
3395 $self->hide;
3396 $self->{binding_cancel}->()
3397 if $self->{binding_cancel};
3398 });
3399
3400 $self->update_binding_widgets;
3401
3402 $self
3403}
3404
3405sub commit {
3406 my ($self) = @_;
3407 my ($mod, $sym, $cmds) = $self->get_binding;
3408 if ($sym != 0 && @$cmds > 0) {
3409 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3410 ."'. Don't forget 'Save Config'!");
3411 $self->{binding_change}->($mod, $sym, $cmds)
3412 if $self->{binding_change};
3413 } else {
3414 $::STATUSBOX->add ("No action bound, no key or action specified!");
3415 $self->{binding_cancel}->()
3416 if $self->{binding_cancel};
3417 }
3418}
3419
3420sub start {
3421 my ($self) = @_;
3422
3423 $self->{rec_btn}->set_text ("stop recording");
3424 $self->{recording} = 1;
3425 $self->clear_command_list;
3426 $::CONN->start_record if $::CONN;
3427}
3428
3429sub stop {
3430 my ($self) = @_;
3431
3432 $self->{rec_btn}->set_text ("start recording");
3433 $self->{recording} = 0;
3434
3435 my $rec;
3436 $rec = $::CONN->stop_record if $::CONN;
3437 return unless ref $rec eq 'ARRAY';
3438 $self->set_command_list ($rec);
3439}
3440
3441
3442sub ask_for_bind_and_commit {
3443 my ($self) = @_;
3444 $self->ask_for_bind (1);
3445}
3446
3447sub ask_for_bind {
3448 my ($self, $commit) = @_;
3449
3450 CFClient::Binder::open_binding_dialog (sub {
3451 my ($mod, $sym) = @_;
3452 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3453 $self->update_binding_widgets;
3454 $self->commit if $commit;
3455 });
3456}
3457
3458# $mod and $sym are the modifiers and key symbol
3459# $cmds is a array ref of strings (the commands)
3460# $cb is the callback that is executed on OK
3461# $ccb is the callback that is executed on CANCEL and
3462# when the binding was unsuccessful on OK
3463sub set_binding {
3464 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3465
3466 $self->clear_command_list;
3467 $self->{recording} = 0;
3468 $self->{rec_btn}->set_text ("start recording");
3469
3470 $self->{binding} = [$mod, $sym];
3471 $self->{commands} = $cmds;
3472
3473 $self->{binding_change} = $cb;
3474 $self->{binding_cancel} = $ccb;
3475
3476 $self->update_binding_widgets;
3477}
3478
3479# this is a shortcut method that asks for a binding
3480# and then just binds it.
3481sub do_quick_binding {
3482 my ($self, $cmds) = @_;
3483 $self->set_binding (undef, undef, $cmds, sub {
3484 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3485 });
3486 $self->ask_for_bind (1);
3487}
3488
3489sub update_binding_widgets {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3493 $self->set_command_list ($cmds);
3494}
3495
3496sub get_binding {
3497 my ($self) = @_;
3498 return (
3499 $self->{binding}->[0],
3500 $self->{binding}->[1],
3501 [ grep { defined $_ } @{$self->{commands}} ]
3502 );
3503}
3504
3505sub clear_command_list {
3506 my ($self) = @_;
3507 $self->{cmdbox}->clear ();
3508}
3509
3510sub set_command_list {
3511 my ($self, $cmds) = @_;
3512
3513 $self->{cmdbox}->clear ();
3514 $self->{commands} = $cmds;
3515
3516 my $idx = 0;
3517
3518 for (@$cmds) {
3519 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3520
3521 my $i = $idx;
3522 $hb->add (new CFClient::UI::Label text => $_);
3523 $hb->add (new CFClient::UI::Button
3524 text => "delete",
3525 tooltip => "Deletes the action from the record",
3526 on_activate => sub {
3527 $self->{cmdbox}->remove ($hb);
3528 $cmds->[$i] = undef;
3529 });
3530
3531
3532 $idx++
3533 }
3534}
3535
3536#############################################################################
3537
3538package CFClient::UI::SpellList;
3539
3540our @ISA = CFClient::UI::Table::;
3541
3542sub new {
3543 my $class = shift;
3544
3545 my $self = $class->SUPER::new (
3546 binding => [],
3547 commands => [],
2742 @_, 3548 @_,
2743 ) 3549 )
2744} 3550}
2745 3551
2746sub configure { 3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
2747 my ($self, $x, $y, $w, $h) = @_; 3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
2748 3558
2749 $self->{w} = $w; 3559sub rebuild_spell_list {
2750 $self->{h} = $h; 3560 my ($self) = @_;
2751}
2752 3561
2753sub check_size { 3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3606sub add_spell {
2754 my ($self) = @_; 3607 my ($self, $spell) = @_;
2755 3608
2756 $self->size_allocate ($self->{w}, $self->{h}) 3609 $self->{spell}->{$spell->{name}} = $spell;
2757 if $self->{w}; 3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620#############################################################################
3621
3622package CFClient::UI::Root;
3623
3624our @ISA = CFClient::UI::Container::;
3625
3626use List::Util qw(min max);
3627
3628use CFClient::OpenGL;
3629
3630sub new {
3631 my $class = shift;
3632
3633 my $self = $class->SUPER::new (
3634 visible => 1,
3635 @_,
3636 );
3637
3638 Scalar::Util::weaken ($self->{root} = $self);
3639
3640 $self
2758} 3641}
2759 3642
2760sub size_request { 3643sub size_request {
2761 my ($self) = @_; 3644 my ($self) = @_;
2762 3645
2763 ($self->{w}, $self->{h}) 3646 ($self->{w}, $self->{h})
3647}
3648
3649sub _to_pixel {
3650 my ($coord, $size, $max) = @_;
3651
3652 $coord =
3653 $coord eq "center" ? ($max - $size) * 0.5
3654 : $coord eq "max" ? $max
3655 : $coord;
3656
3657 $coord = 0 if $coord < 0;
3658 $coord = $max - $size if $coord > $max - $size;
3659
3660 int $coord + 0.5
2764} 3661}
2765 3662
2766sub size_allocate { 3663sub size_allocate {
2767 my ($self, $w, $h) = @_; 3664 my ($self, $w, $h) = @_;
2768 3665
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2785 for my $child ($self->children) { 3666 for my $child ($self->children) {
2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3667 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787 3668
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3669 $X = $child->{force_x} if exists $child->{force_x};
2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3670 $Y = $child->{force_y} if exists $child->{force_y};
3671
3672 $X = _to_pixel $X, $W, $self->{w};
3673 $Y = _to_pixel $Y, $H, $self->{h};
3674
2790 $child->configure ($X, $Y, $W, $H); 3675 $child->configure ($X, $Y, $W, $H);
2791 } 3676 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795} 3677}
2796 3678
2797sub coord2local { 3679sub coord2local {
2798 my ($self, $x, $y) = @_; 3680 my ($self, $x, $y) = @_;
2799 3681
… …
2807} 3689}
2808 3690
2809sub update { 3691sub update {
2810 my ($self) = @_; 3692 my ($self) = @_;
2811 3693
2812 $self->check_size;
2813 $::WANT_REFRESH++; 3694 $::WANT_REFRESH++;
2814} 3695}
2815 3696
2816sub add { 3697sub add {
2817 my ($self, $child) = @_; 3698 my ($self, @children) = @_;
2818 3699
2819 # integerise window positions 3700 $_->{is_toplevel} = 1
2820 $child->{x} = int $child->{x}; 3701 for @children;
2821 $child->{y} = int $child->{y};
2822 3702
2823 $self->SUPER::add ($child); 3703 $self->SUPER::add (@children);
3704}
3705
3706sub remove {
3707 my ($self, @children) = @_;
3708
3709 $self->SUPER::remove (@children);
3710
3711 delete $self->{is_toplevel}
3712 for @children;
3713
3714 while (@children) {
3715 my $w = pop @children;
3716 push @children, $w->children;
3717 $w->set_invisible;
3718 }
2824} 3719}
2825 3720
2826sub on_refresh { 3721sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3722 my ($self, $id, $cb) = @_;
2828 3723
2829 $self->{refresh_hook}{$id} = $cb; 3724 $self->{refresh_hook}{$id} = $cb;
2830} 3725}
2831 3726
3727sub on_post_alloc {
3728 my ($self, $id, $cb) = @_;
3729
3730 $self->{post_alloc_hook}{$id} = $cb;
3731}
3732
2832sub draw { 3733sub draw {
2833 my ($self) = @_; 3734 my ($self) = @_;
2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878 3735
2879 while ($self->{refresh_hook}) { 3736 while ($self->{refresh_hook}) {
2880 $_->() 3737 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3738 for values %{delete $self->{refresh_hook}};
2882 } 3739 }
2883 3740
3741 if ($self->{realloc}) {
3742 my %queue;
3743 my @queue;
3744 my $widget;
3745
3746 outer:
3747 while () {
3748 if (my $realloc = delete $self->{realloc}) {
3749 for $widget (values %$realloc) {
3750 $widget->{visible} or next; # do not resize invisible widgets
3751
3752 $queue{$widget+0}++ and next; # duplicates are common
3753
3754 push @{ $queue[$widget->{visible}] }, $widget;
3755 }
3756 }
3757
3758 while () {
3759 @queue or last outer;
3760
3761 $widget = pop @{ $queue[-1] || [] }
3762 and last;
3763
3764 pop @queue;
3765 }
3766
3767 delete $queue{$widget+0};
3768
3769 my ($w, $h) = $widget->size_request;
3770
3771 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3772 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3773
3774 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3775 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3776
3777 $w = $widget->{force_w} if exists $widget->{force_w};
3778 $h = $widget->{force_h} if exists $widget->{force_h};
3779
3780 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3781 || delete $widget->{force_realloc}) {
3782 $widget->{req_w} = $w;
3783 $widget->{req_h} = $h;
3784
3785 $self->{size_alloc}{$widget+0} = $widget;
3786
3787 if (my $parent = $widget->{parent}) {
3788 $self->{realloc}{$parent+0} = $parent
3789 unless $queue{$parent+0};
3790
3791 $parent->{force_size_alloc} = 1;
3792 $self->{size_alloc}{$parent+0} = $parent;
3793 }
3794 }
3795
3796 delete $self->{realloc}{$widget+0};
3797 }
3798 }
3799
3800 while (my $size_alloc = delete $self->{size_alloc}) {
3801 my @queue = sort { $b->{visible} <=> $a->{visible} }
3802 values %$size_alloc;
3803
3804 while () {
3805 my $widget = pop @queue || last;
3806
3807 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3808
3809 $w = 0 if $w < 0;
3810 $h = 0 if $h < 0;
3811
3812 $w = int $w + 0.5;
3813 $h = int $h + 0.5;
3814
3815 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3816 $widget->{old_w} = $widget->{w};
3817 $widget->{old_h} = $widget->{h};
3818
3819 $widget->{w} = $w;
3820 $widget->{h} = $h;
3821
3822 $widget->emit (size_allocate => $w, $h);
3823 }
3824 }
3825 }
3826
3827 while ($self->{post_alloc_hook}) {
3828 $_->()
3829 for values %{delete $self->{post_alloc_hook}};
3830 }
3831
3832
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3833 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3834 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3835 glClear GL_COLOR_BUFFER_BIT;
2887 3836
2888 glMatrixMode GL_PROJECTION; 3837 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 3838 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3839 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 3840 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 3841 glLoadIdentity;
2893 3842
3843 {
3844 package CFClient::UI::Base;
3845
3846 ($draw_x, $draw_y, $draw_w, $draw_h) =
3847 (0, 0, $self->{w}, $self->{h});
3848 }
3849
2894 $self->_draw; 3850 $self->_draw;
2895} 3851}
2896 3852
2897############################################################################# 3853#############################################################################
2898 3854
2899package CFClient::UI; 3855package CFClient::UI;
2900 3856
2901$ROOT = new CFClient::UI::Root; 3857$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 3858$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903 3859
29041 38601
2905 3861

Diff Legend

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