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

Diff Legend

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