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

Diff Legend

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