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

Diff Legend

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