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

Diff Legend

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