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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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