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

Diff Legend

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