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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

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

Diff Legend

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