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

Diff Legend

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