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

Diff Legend

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