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

Diff Legend

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