ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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