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.211 by elmex, Wed May 17 10:33:03 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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