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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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