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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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