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

Diff Legend

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