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

Diff Legend

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