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.57 by root, Mon Apr 10 22:53:49 2006 UTC vs.
Revision 1.137 by root, Wed Apr 19 21:38:05 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
16 14
17# class methods for events 15# class methods for events
18sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
23 $FOCUS->key_up ($_[0]) if $FOCUS; 21 $FOCUS->key_up ($_[0]) if $FOCUS;
24} 22}
25 23
26sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
27 my ($ev) = @_; 25 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->{x}, $ev->{y});
29 27
30 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
32 30
33 $GRAB = $widget; 31 $GRAB = $widget;
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
38 36
39 $GRAB->button_down ($ev) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->{x}, $ev->{y});
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
54 } 54 }
55} 55}
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->{x}, $ev->{y});
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
84}
85
86#############################################################################
87
88package CFClient::UI::Base;
89
90use strict;
91
92use SDL::OpenGL;
72 93
73sub new { 94sub new {
74 my $class = shift; 95 my $class = shift;
75 96
76 bless { @_ }, $class 97 my $self = bless {
98 x => 0,
99 y => 0,
100 z => 0,
101 @_
102 }, $class;
103
104 for (keys %$self) {
105 if (/^connect_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_});
107 }
108 }
109
110 $self
111}
112
113sub show {
114 my ($self) = @_;
115
116 return if $self->{parent};
117
118 $CFClient::UI::ROOT->add ($self);
119}
120
121sub hide {
122 my ($self) = @_;
123
124 return unless $self->{parent};
125
126 $self->{parent}->remove ($self);
77} 127}
78 128
79sub move { 129sub move {
80 my ($self, $x, $y, $z) = @_; 130 my ($self, $x, $y, $z) = @_;
131
81 $self->{x} = $x; 132 $self->{x} = int $x;
82 $self->{y} = $y; 133 $self->{y} = int $y;
83 $self->{z} = $z if defined $z; 134 $self->{z} = $z if defined $z;
135
136 $self->update;
84} 137}
85 138
86sub needs_redraw { 139sub needs_redraw {
87 0 140 0
88} 141}
… …
90sub size_request { 143sub size_request {
91 require Carp; 144 require Carp;
92 Carp::confess "size_request is abtract"; 145 Carp::confess "size_request is abtract";
93} 146}
94 147
95sub size_allocate { 148sub configure {
96 my ($self, $w, $h) = @_; 149 my ($self, $x, $y, $w, $h) = @_;
150
151 $self->{x} = $x;
152 $self->{y} = $y;
153
154 return unless $self->{w} != $w || $self->{h} != $h;
97 155
98 $self->{w} = $w; 156 $self->{w} = $w;
99 $self->{h} = $h; 157 $self->{h} = $h;
158
159 $self->size_allocate ($w, $h);
160 $self->update;
161}
162
163sub size_allocate {
164 # nothing to be done
165}
166
167# return top left coordinates
168sub _topleft {
169 my ($self, $x, $y) = @_;
170
171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
172}
173
174# translate global coordinates to local coordinate system
175sub coord2local {
176 my ($self, $x, $y) = @_;
177
178 my ($X, $Y) = $self->_topleft;
179 ($x - $X, $y - $Y)
180}
181
182# translate local coordinates to global coordinate system
183sub coord2global {
184 my ($self, $x, $y) = @_;
185
186 my ($X, $Y) = $self->_topleft;
187 ($x + $X, $y + $Y)
100} 188}
101 189
102sub focus_in { 190sub focus_in {
103 my ($self) = @_; 191 my ($self) = @_;
104 192
193 return if $FOCUS == $self;
194 return unless $self->{can_focus};
195
105 my $focus = $FOCUS; $FOCUS = $self; 196 my $focus = $FOCUS; $FOCUS = $self;
197
198 $self->emit (focus_in => $focus);
199
106 $focus->update if $focus; 200 $focus->update if $focus;
107 $FOCUS->update; 201 $FOCUS->update;
108} 202}
109 203
110sub focus_out { 204sub focus_out {
111 my ($self) = @_; 205 my ($self) = @_;
112 206
113 return unless $FOCUS == $self; 207 return unless $FOCUS == $self;
114 208
115 my $focus = $FOCUS; undef $FOCUS; 209 my $focus = $FOCUS; undef $FOCUS;
210
211 $self->emit (focus_out => $focus);
212
116 $focus->update if $focus; #? 213 $focus->update if $focus; #?
117} 214}
118 215
119sub mouse_motion { } 216sub mouse_motion { }
120sub button_up { } 217sub button_up { }
121sub button_down { }
122sub key_down { } 218sub key_down { }
123sub key_up { } 219sub key_up { }
220
221sub button_down {
222 my ($self, $ev, $x, $y) = @_;
223
224 $self->focus_in;
225}
124 226
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 227sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 228sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 229sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 230sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 231sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 232
131sub draw { 233sub draw {
132 my ($self) = @_; 234 my ($self) = @_;
133 235
236 return unless $self->{h} && $self->{w};
237
134 glPushMatrix; 238 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 239 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 240 $self->_draw;
137 if ($self == $HOVER) { 241 glPopMatrix;
138 glColor 1, 1, 1, 0.4; 242
243 if ($self == $HOVER && $self->{can_hover}) {
244 my ($x, $y) = @$self{qw(x y)};
245
246 glColor 1, 0.8, 0.5, 0.2;
139 glEnable GL_BLEND; 247 glEnable GL_BLEND;
248 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 249 glBegin GL_QUADS;
141 glVertex 0 , 0; 250 glVertex $x , $y;
142 glVertex $self->{w}, 0; 251 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 252 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 253 glVertex $x , $y + $self->{h};
145 glEnd; 254 glEnd;
146 glDisable GL_BLEND; 255 glDisable GL_BLEND;
147 } 256 }
148 glPopMatrix;
149} 257}
150 258
151sub _draw { 259sub _draw {
152 my ($self) = @_; 260 my ($self) = @_;
153 261
154 warn "no draw defined for $self\n"; 262 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 263}
167 264
168sub find_widget { 265sub find_widget {
169 my ($self, $x, $y) = @_; 266 my ($self, $x, $y) = @_;
170 267
… …
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 270 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 271
175 () 272 ()
176} 273}
177 274
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 275sub set_parent {
181 my ($self, $par) = @_; 276 my ($self, $parent) = @_;
182 277
183 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 278 Scalar::Util::weaken ($self->{parent} = $parent);
185} 279}
186 280
187sub get_parent { 281sub check_size {
188 $_[0]->{parent} 282 my ($self) = @_;
283
284 my ($w, $h) = $self->size_request;
285
286 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w;
288 $self->{req_h} = $h;
289
290 $self->{parent}->check_size
291 if $self->{parent};
292 }
189} 293}
190 294
191sub update { 295sub update {
192 my ($self) = @_; 296 my ($self) = @_;
193 297
194 $self->{parent}->update 298 $self->{parent}->update
195 if $self->{parent}; 299 if $self->{parent};
196} 300}
197 301
302sub connect {
303 my ($self, $signal, $cb) = @_;
304
305 push @{ $self->{signal_cb}{$signal} }, $cb;
306}
307
308sub emit {
309 my ($self, $signal, @args) = @_;
310
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
312 $cb->($self, @args);
313 }
314}
315
198sub DESTROY { 316sub DESTROY {
199 my ($self) = @_; 317 my ($self) = @_;
200 318
201 #$self->deactivate; 319 #$self->deactivate;
202} 320}
203 321
204############################################################################# 322#############################################################################
205 323
206package Crossfire::Client::Widget::Container; 324package CFClient::UI::DrawBG;
207 325
208our @ISA = Crossfire::Client::Widget::; 326our @ISA = CFClient::UI::Base::;
327
328use strict;
329use SDL::OpenGL;
209 330
210sub new { 331sub new {
332 my $class = shift;
333
334 # range [value, low, high, page]
335
336 $class->SUPER::new (
337 bg => [0, 0, 0, 0.2],
338 active_bg => [1, 1, 1, 0.5],
339 @_
340 )
341}
342
343sub _draw {
344 my ($self) = @_;
345
346 my ($w, $h) = @$self{qw(w h)};
347
348 glEnable GL_BLEND;
349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
350 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
351
352 glBegin GL_QUADS;
353 glVertex 0 , 0;
354 glVertex 0 , $h;
355 glVertex $w, $h;
356 glVertex $w, 0;
357 glEnd;
358
359 glDisable GL_BLEND;
360}
361
362#############################################################################
363
364package CFClient::UI::Empty;
365
366our @ISA = CFClient::UI::Base::;
367
368sub size_request {
369 (0, 0)
370}
371
372sub draw { }
373
374#############################################################################
375
376package CFClient::UI::Container;
377
378our @ISA = CFClient::UI::Base::;
379
380sub new {
211 my ($class, @widgets) = @_; 381 my ($class, %arg) = @_;
212 382
383 my $children = delete $arg{children} || [];
384
213 my $self = $class->SUPER::new (children => []); 385 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 386 $self->add ($_) for @$children;
215 387
216 $self 388 $self
217} 389}
218 390
219sub add { 391sub add {
220 my ($self, $chld, $expand) = @_; 392 my ($self, $child) = @_;
221 393
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 394 $child->set_parent ($self);
224 395
396 use sort 'stable';
397
225 @{$self->{children}} = 398 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 399 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 400 @{$self->{children}}, $child
401 ];
228 402
229 $self->size_allocate ($self->{w}, $self->{h}) 403 $child->check_size;
230 if $self->{w}; #TODO: check for "realised state"
231} 404}
232 405
233sub remove { 406sub remove {
234 my ($self, $widget) = @_; 407 my ($self, $child) = @_;
235 408
409 delete $child->{parent};
410
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
237 412
238 $self->size_allocate ($self->{w}, $self->{h}); 413 $self->check_size;
239} 414}
240 415
241sub find_widget { 416sub find_widget {
242 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
243 418
… …
260 $_->draw for @{$self->{children}}; 435 $_->draw for @{$self->{children}};
261} 436}
262 437
263############################################################################# 438#############################################################################
264 439
265package Crossfire::Client::Widget::Bin; 440package CFClient::UI::Bin;
266 441
267our @ISA = Crossfire::Client::Widget::Container::; 442our @ISA = CFClient::UI::Container::;
443
444sub new {
445 my ($class, %arg) = @_;
446
447 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
448
449 $class->SUPER::new (children => [$child], %arg)
450}
451
452sub add {
453 my ($self, $child) = @_;
454
455 $self->{children} = [];
456
457 $self->SUPER::add ($child);
458}
459
460sub remove {
461 my ($self, $widget) = @_;
462
463 $self->SUPER::remove ($widget);
464
465 $self->{children} = [new CFClient::UI::Empty]
466 unless @{$self->{children}};
467}
268 468
269sub child { $_[0]->{children}[0] } 469sub child { $_[0]->{children}[0] }
270 470
271sub size_request { 471sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 472 $_[0]{children}[0]->size_request
273} 473}
274 474
275sub size_allocate { 475sub size_allocate {
276 my ($self, $w, $h) = @_; 476 my ($self, $w, $h) = @_;
277 477
278 $self->SUPER::size_allocate ($w, $h); 478 $self->{children}[0]->configure (0, 0, $w, $h);
279 $self->{children}[0]->size_allocate ($w, $h)
280 if $self->{children}[0]
281} 479}
282 480
283############################################################################# 481#############################################################################
284 482
285package Crossfire::Client::Widget::Window; 483package CFClient::UI::Window;
286 484
287our @ISA = Crossfire::Client::Widget::Bin::; 485our @ISA = CFClient::UI::Bin::;
288 486
289use SDL::OpenGL; 487use SDL::OpenGL;
290 488
291sub new { 489sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 490 my ($class, %arg) = @_;
293 491
294 my $self = $class->SUPER::new; 492 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 493}
298 494
299sub update { 495sub update {
300 my ($self) = @_; 496 my ($self) = @_;
301 497
498 # we want to do this delayed...
302 $self->render_chld; 499 $self->render_chld;
303 $self->SUPER::update; 500 $self->SUPER::update;
304} 501}
305 502
306sub render_chld { 503sub render_chld {
307 my ($self) = @_; 504 my ($self) = @_;
308 505
309 $self->{texture} = 506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
310 Crossfire::Client::Texture->new_from_opengl ( 507 glClearColor 0, 0, 0, 1;
311 $self->{w}, $self->{h}, sub { $self->child->draw } 508 glClear GL_COLOR_BUFFER_BIT;
312 ); 509 $self->child->draw;
510 };
313} 511}
314 512
315sub size_allocate { 513sub size_allocate {
316 my ($self, $w, $h) = @_; 514 my ($self, $w, $h) = @_;
317 515
318 $self->{w} = $w; 516 $self->child->configure (0, 0, $w, $h);
319 $self->{h} = $h;
320
321 $self->child->size_allocate ($w, $h);
322 517
323 $self->render_chld; 518 $self->render_chld;
324} 519}
325 520
326sub _draw { 521sub _draw {
… …
330 525
331 my $tex = $self->{texture} 526 my $tex = $self->{texture}
332 or return; 527 or return;
333 528
334 glEnable GL_BLEND; 529 glEnable GL_BLEND;
530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 531 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 533
338 $tex->draw_quad (0, 0, $w, $h); 534 $tex->draw_quad (0, 0, $w, $h);
339 535
… …
341 glDisable GL_TEXTURE_2D; 537 glDisable GL_TEXTURE_2D;
342} 538}
343 539
344############################################################################# 540#############################################################################
345 541
346package Crossfire::Client::Widget::Frame; 542package CFClient::UI::ViewPort;
347 543
348our @ISA = Crossfire::Client::Widget::Bin::; 544our @ISA = CFClient::UI::Window::;
545
546sub new { die }
547
548sub size_request {
549 my ($self) = @_;
550
551 @$self{qw(child_w child_h)} = $self->child->size_request;
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553
554 @$self{qw(child_w child_h)}
555}
556
557sub _draw {
558 my ($self) = @_;
559
560 $self->{children}[1]->draw;
561}
562
563
564#############################################################################
565
566package CFClient::UI::Frame;
567
568our @ISA = CFClient::UI::Bin::;
349 569
350use SDL::OpenGL; 570use SDL::OpenGL;
351 571
352sub size_request { 572sub size_request {
353 my ($self) = @_; 573 my ($self) = @_;
… …
358 578
359 map { $_ + 4 } $chld->size_request; 579 map { $_ + 4 } $chld->size_request;
360} 580}
361 581
362sub size_allocate { 582sub size_allocate {
363 my ($self, $w, $h) = @_; 583 my ($self, $x, $y, $w, $h) = @_;
364 584
365 $self->{w} = $w;
366 $self->{h} = $h;
367
368 $self->child->size_allocate ($w - 4, $h - 4); 585 $self->child->configure (2, 2, $w - 4, $h - 4);
369 $self->child->move (2, 2);
370} 586}
371 587
372sub _draw { 588sub _draw {
373 my ($self) = @_; 589 my ($self) = @_;
374 590
… …
387 $chld->draw; 603 $chld->draw;
388} 604}
389 605
390############################################################################# 606#############################################################################
391 607
392package Crossfire::Client::Widget::FancyFrame; 608package CFClient::UI::FancyFrame;
393 609
394our @ISA = Crossfire::Client::Widget::Bin::; 610our @ISA = CFClient::UI::Bin::;
395 611
396use SDL::OpenGL; 612use SDL::OpenGL;
397 613
398my @tex = 614my @tex =
399 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
400 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 616 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
401 617
618sub new {
619 my $class = shift;
620
621 # TODO: user_x, user_y, overwrite moveto?
622
623 $class->SUPER::new (
624 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1],
626 border => 0.8,
627 @_
628 )
629}
630
631sub border {
632 int $_[0]{border} * $::FONTSIZE
633}
634
402sub size_request { 635sub size_request {
403 my ($self) = @_; 636 my ($self) = @_;
404 637
638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639
405 my ($w, $h) = $self->SUPER::size_request; 640 my ($w, $h) = $self->SUPER::size_request;
406 641
407 $h += $tex[1]->{height}; 642 (
408 $h += $tex[4]->{height}; 643 $w + $self->border * 2,
409 $w += $tex[2]->{width}; 644 $h + $self->border * 2,
410 $w += $tex[3]->{width}; 645 )
411
412 ($w, $h)
413} 646}
414 647
415sub size_allocate { 648sub size_allocate {
416 my ($self, $w, $h) = @_; 649 my ($self, $w, $h) = @_;
417 650
418 $self->SUPER::size_allocate ($w, $h); 651 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2;
419 653
420 $h -= $tex[1]->{height}; 654 $self->child->configure ($self->border, $self->border, $w, $h);
421 $h -= $tex[4]->{height}; 655}
422 $w -= $tex[2]->{width};
423 $w -= $tex[3]->{width};
424 656
425 $h = $h < 0 ? 0 : $h; 657sub button_down {
426 $w = $w < 0 ? 0 : $w; 658 my ($self, $ev, $x, $y) = @_;
427 659
428 $self->child->size_allocate ($w, $h); 660 my $border = $self->border;
429 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 661
662 if ($x < $self->{w} && $x >= $self->{w} - $border
663 && $y < $self->{h} && $y >= $self->{h} - $border) {
664
665 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
666 my ($bw, $bh) = ($self->{w}, $self->{h});
667
668 $self->{motion} = sub {
669 my ($ev, $x, $y) = @_;
670
671 ($x, $y) = ($ev->motion_x, $ev->motion_y);
672
673 $self->{user_w} = $bw + $x - $ox;
674 $self->{user_h} = $bh + $y - $oy;
675 $self->check_size;
676 };
677
678 } elsif ($x >= 0 && $x < $self->{w}
679 && $y >= 0 && $y < $border) {
680
681 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
682 my ($bx, $by) = ($self->{x}, $self->{y});
683
684 $self->{motion} = sub {
685 my ($ev, $x, $y) = @_;
686
687 ($x, $y) = ($ev->motion_x, $ev->motion_y);
688
689 $self->move ($bx + $x - $ox, $by + $y - $oy);
690 $self->update;
691 };
692 }
693}
694
695sub button_up {
696 my ($self, $ev, $x, $y) = @_;
697
698 delete $self->{motion};
699}
700
701sub mouse_motion {
702 my ($self, $ev, $x, $y) = @_;
703
704 $self->{motion}->($ev, $x, $y) if $self->{motion};
430} 705}
431 706
432sub _draw { 707sub _draw {
433 my ($self) = @_; 708 my ($self) = @_;
434 709
435 my ($w, $h) = ($self->{w}, $self->{h}); 710 my ($w, $h ) = ($self->{w}, $self->{h});
436 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 711 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
437 712
438 glEnable GL_BLEND; 713 glEnable GL_BLEND;
714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
439 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
440 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
442 717
443 my $top = $tex[1]; 718 my $border = $self->border;
719
720 glColor @{ $self->{border_bg} };
444 $top->draw_quad (0, 0, $w, $top->{height}); 721 $tex[1]->draw_quad (0, 0, $w, $border);
445 722 $tex[3]->draw_quad (0, $border, $border, $ch);
446 my $left = $tex[3]; 723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
447 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 724 $tex[4]->draw_quad (0, $h - $border, $w, $border);
448
449 my $right = $tex[2];
450 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
451
452 my $bottom = $tex[4];
453 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
454 725
455 my $bg = $tex[0]; 726 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 727
728 # TODO: repeat texture not scale
461 my $rep_x = $cw / $bg->{width}; 729 my $rep_x = $cw / $bg->{w};
462 my $rep_y = $ch / $bg->{height}; 730 my $rep_y = $ch / $bg->{h};
463 731
464 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 732 glColor @{ $self->{bg} };
465 733
734 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1;
737 $bg->draw_quad ($border, $border, $cw, $ch);
738
739 glDisable GL_TEXTURE_2D;
466 glDisable GL_BLEND; 740 glDisable GL_BLEND;
467 glDisable GL_TEXTURE_2D;
468 741
469 $self->child->draw; 742 $self->child->draw;
470
471} 743}
472 744
473############################################################################# 745#############################################################################
474 746
475package Crossfire::Client::Widget::Table; 747package CFClient::UI::Table;
476 748
477our @ISA = Crossfire::Client::Widget::Bin::; 749our @ISA = CFClient::UI::Base::;
750
751use List::Util qw(max sum);
478 752
479use SDL::OpenGL; 753use SDL::OpenGL;
480 754
755sub new {
756 my $class = shift;
757
758 $class->SUPER::new (
759 col_expand => [],
760 @_
761 )
762}
763
481sub add { 764sub add {
482 my ($self, $x, $y, $chld) = @_; 765 my ($self, $x, $y, $child) = @_;
483 my $old_chld = $self->{children}[$y][$x];
484 766
767 $child->set_parent ($self);
485 $self->{children}[$y][$x] = $chld; 768 $self->{children}[$y][$x] = $child;
486 $chld->set_parent ($self); 769
770 $child->check_size;
771}
772
773# TODO: move to container class maybe? send childs a signal on removal?
774sub clear {
775 my ($self) = @_;
776
777 delete $self->{children};
487 $self->update; 778 $self->update;
488} 779}
489 780
490sub max_row_height { 781sub get_wh {
491 my ($self, $row) = @_; 782 my ($self) = @_;
492 783
493 my $hs = 0; 784 my (@w, @h);
494 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 785
786 for my $y (0 .. $#{$self->{children}}) {
495 my $c = $self->{children}->[$row]->[$xi]; 787 my $row = $self->{children}[$y]
496 if ($c) { 788 or next;
789
790 for my $x (0 .. $#$row) {
791 my $widget = $row->[$x]
792 or next;
497 my ($w, $h) = $c->size_request; 793 my ($w, $h) = $widget->size_request;
498 if ($hs < $h) { $hs = $h } 794
795 $w[$x] = max $w[$x], $w;
796 $h[$y] = max $h[$y], $h;
499 } 797 }
500 } 798 }
501 return $hs;
502}
503 799
504sub max_col_width { 800 (\@w, \@h)
801}
802
803sub size_request {
505 my ($self, $col) = @_; 804 my ($self) = @_;
506 805
806 my ($ws, $hs) = $self->get_wh;
807
808 (
809 (sum @$ws),
810 (sum @$hs),
811 )
812}
813
814sub size_allocate {
815 my ($self, $w, $h) = @_;
816
817 my ($ws, $hs) = $self->get_wh;
818
819 my $req_w = sum @$ws;
820 my $req_h = sum @$hs;
821
822 # TODO: nicer code && do row_expand
823 my @col_expand = @{$self->{col_expand}};
824 @col_expand = (1) x @$ws unless @col_expand;
825 my $col_expand = (sum @col_expand) || 1;
826
827 # linearly scale sizes
828 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
829 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
830
831 CFClient::UI::harmonize $ws;
832 CFClient::UI::harmonize $hs;
833
834 my $y;
835
836 for my $r (0 .. $#{$self->{children}}) {
837 my $row = $self->{children}[$r]
838 or next;
839
507 my $ws = 0; 840 my $x = 0;
508 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 841 my $row_h = $hs->[$r];
509 my $c = ($self->{children}->[$yi] || [])->[$col]; 842
510 if ($c) { 843 for my $c (0 .. $#$row) {
511 my ($w, $h) = $c->size_request; 844 my $col_w = $ws->[$c];
512 if ($ws < $w) { $ws = $w } 845
846 if (my $widget = $row->[$c]) {
847 $widget->configure ($x, $y, $col_w, $row_h);
848 }
849
850 $x += $col_w;
513 } 851 }
852
853 $y += $row_h;
514 } 854 }
515 return $ws; 855
516} 856}
857
858sub find_widget {
859 my ($self, $x, $y) = @_;
860
861 $x -= $self->{x};
862 $y -= $self->{y};
863
864 my $res;
865
866 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
867 $res = $_->find_widget ($x, $y)
868 and return $res;
869 }
870
871 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
872}
873
874sub _draw {
875 my ($self) = @_;
876
877 for (grep $_, @{$self->{children}}) {
878 $_->draw for grep $_, @$_;
879 }
880}
881
882#############################################################################
883
884package CFClient::UI::HBox;
885
886# TODO: wrap into common Box base class
887
888our @ISA = CFClient::UI::Container::;
517 889
518sub size_request { 890sub size_request {
519 my ($self) = @_; 891 my ($self) = @_;
520 892
893 my @alloc = map [$_->size_request], @{$self->{children}};
894
895 (
896 (List::Util::sum map $_->[0], @alloc),
897 (List::Util::max map $_->[1], @alloc),
898 )
899}
900
901sub size_allocate {
902 my ($self, $w, $h) = @_;
903
521 my ($hs, $ws) = (0, 0); 904 ($h, $w) = ($w, $h);
522 905
523 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 906 my $children = $self->{children};
524 $hs += $self->max_row_height ($yi);
525 }
526 907
527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 908 my @h = map +($_->size_request)[0], @$children;
528 my $wm = 0; 909
529 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 910 my $req_h = List::Util::sum @h;
530 $wm += $self->max_col_width ($xi) 911
912 if ($req_h > $h) {
913 # ah well, not enough space
914 $_ *= $h / $req_h for @h;
915 } else {
916 my $exp = List::Util::sum map $_->{expand}, @$children;
917 $exp ||= 1;
918
919 for (0 .. $#$children) {
920 my $child = $children->[$_];
921
922 my $alloc_h = $h[$_];
923 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
924 $h[$_] = $alloc_h;
531 } 925 }
532 if ($ws < $wm) { $ws = $wm }
533 } 926 }
534 927
535 return ($ws, $hs); 928 CFClient::UI::harmonize \@h;
536}
537
538sub _draw {
539 my ($self) = @_;
540 929
541 my $y = 0; 930 my $y = 0;
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 931 for (0 .. $#$children) {
932 my $child = $children->[$_];
543 my $x = 0; 933 my $h = $h[$_];
934 $child->configure ($y, 0, $h, $w);
544 935
545 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 936 $y += $h;
937 }
546 938
547 my $c = $self->{children}->[$yi]->[$xi];
548 if ($c) {
549 $c->move ($x, $y, 0); #TODO: Move to size_request
550 $c->draw if $c;
551 }
552
553 $x += $self->max_col_width ($xi);
554 }
555
556 $y += $self->max_row_height ($yi);
557 } 939 1
558} 940}
559 941
560############################################################################# 942#############################################################################
561 943
562package Crossfire::Client::Widget::VBox; 944package CFClient::UI::VBox;
563 945
946# TODO: wrap into common Box base class
947
564our @ISA = Crossfire::Client::Widget::Container::; 948our @ISA = CFClient::UI::Container::;
565
566use SDL::OpenGL;
567 949
568sub size_request { 950sub size_request {
569 my ($self) = @_; 951 my ($self) = @_;
570 952
571 my @alloc = map [$_->size_request], @{$self->{children}}; 953 my @alloc = map [$_->size_request], @{$self->{children}};
… …
577} 959}
578 960
579sub size_allocate { 961sub size_allocate {
580 my ($self, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
581 963
582 $self->w ($w); 964 my $children = $self->{children};
583 $self->h ($h);
584 965
585 my $exp; 966 my @h = map +($_->size_request)[1], @$children;
586 my @oth; 967
587 # find expand widget 968 my $req_h = List::Util::sum @h;
588 for (@{$self->{children}}) { 969
589 if ($_->{expand}) { 970 if ($req_h > $h) {
971 # ah well, not enough space
972 $_ *= $h / $req_h for @h;
973 } else {
974 my $exp = List::Util::sum map $_->{expand}, @$children;
590 $exp = $_; 975 $exp ||= 1;
591 last; 976
977 for (0 .. $#$children) {
978 my $child = $children->[$_];
979
980 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
592 } 981 }
593 push @oth, $_;
594 } 982 }
595 983
596 my ($ow, $oh); 984 CFClient::UI::harmonize \@h;
597
598 # get sizes of other widgets
599 for (@oth) {
600 my ($w, $h) = $_->size_request;
601 $oh += $h;
602 if ($ow < $w) { $ow = $w }
603 }
604 985
605 my $y = 0; 986 my $y = 0;
606 for (@{$self->{children}}) { 987 for (0 .. $#$children) {
607 $_->move (0, $y); 988 my $child = $children->[$_];
989 my $h = $h[$_];
990 $child->configure (0, $y, $w, $h);
608 991
609 if ($_ == $exp) {
610 $_->size_allocate ($w, $h - $oh);
611 $y += $h - $oh;
612 } else {
613 my ($cw, $h) = $_->size_request;
614 $_->size_allocate ($w, $h);
615 $y += $h; 992 $y += $h;
616 } 993 }
994
617 } 995 1
618} 996}
619 997
620############################################################################# 998#############################################################################
621 999
622package Crossfire::Client::Widget::Label; 1000package CFClient::UI::Label;
623 1001
624our @ISA = Crossfire::Client::Widget::; 1002our @ISA = CFClient::UI::Base::;
625 1003
626use SDL::OpenGL; 1004use SDL::OpenGL;
627 1005
628sub new { 1006sub new {
629 my ($class, $x, $y, $z, $height, $text) = @_; 1007 my ($class, %arg) = @_;
630 1008
631 $height ||= $::FONTSIZE; 1009 my $self = $class->SUPER::new (
1010 fg => [1, 1, 1],
1011 fontsize => 1,
1012 text => "",
1013 align => -1,
1014 valign => -1,
1015 padding => 2,
1016 layout => new CFClient::Layout,
1017 %arg
1018 );
632 1019
633 # TODO: color, and make height, xyz etc. optional 1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
634 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
635 1021
636 $self->set_text ($text); 1022 $self->set_text (delete $self->{text}) if exists $self->{text};
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
637 1024
638 $self 1025 $self
1026}
1027
1028sub escape_text {
1029 local $_ = $_[1];
1030
1031 s/&/&amp;/g;
1032 s/>/&gt;/g;
1033 s/</&lt;/g;
1034
1035 $_[1]
639} 1036}
640 1037
641sub set_text { 1038sub set_text {
642 my ($self, $text) = @_; 1039 my ($self, $text) = @_;
643 1040
1041 $self->{layout}->set_text ($text);
1042
1043 delete $self->{texture};
1044 $self->update;
1045}
1046
1047sub set_markup {
1048 my ($self, $markup) = @_;
1049
1050 $self->{layout}->set_markup ($markup);
1051
1052 delete $self->{texture};
1053 $self->update;
1054}
1055
1056sub size_request {
1057 my ($self) = @_;
1058
1059 $self->{layout}->set_width;
1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061
1062 my ($w, $h) = $self->{layout}->size;
1063
1064 (
1065 $w + $self->{padding} * 2,
1066 $h + $self->{padding} * 2,
1067 )
1068}
1069
1070sub size_allocate {
1071 my ($self, $w, $h) = @_;
1072
1073 delete $self->{texture};
1074}
1075
1076sub _draw {
1077 my ($self) = @_;
1078
1079 my $tex = $self->{texture} ||= do {
1080 $self->{layout}->set_width ($self->{w});
1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1082 new_from_layout CFClient::Texture $self->{layout}
1083 };
1084
1085 glEnable GL_BLEND;
1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1087 glEnable GL_TEXTURE_2D;
1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1089
1090 glColor @{$self->{fg}};
1091
1092 $self->{ox} = int (
1093 $self->{align} < 0 ? $self->{padding}
1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
1097
1098 $self->{oy} = int (
1099 $self->{valign} < 0 ? $self->{padding}
1100 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101 : ($self->{h} - $tex->{h}) * 0.5
1102 );
1103
1104 $tex->draw_quad ($self->{ox}, $self->{oy});
1105
1106 glDisable GL_TEXTURE_2D;
1107 glDisable GL_BLEND;
1108}
1109
1110#############################################################################
1111
1112package CFClient::UI::EntryBase;
1113
1114our @ISA = CFClient::UI::Label::;
1115
1116use SDL::OpenGL;
1117
1118sub new {
1119 my $class = shift;
1120
1121 $class->SUPER::new (
1122 fg => [1, 1, 1],
1123 bg => [0, 0, 0, 0.2],
1124 active_bg => [1, 1, 1, 0.5],
1125 active_fg => [0, 0, 0],
1126 can_hover => 1,
1127 can_focus => 1,
1128 valign => 0,
1129 @_
1130 )
1131}
1132
1133sub _set_text {
1134 my ($self, $text) = @_;
1135
1136 delete $self->{cur_h};
1137
1138 return if $self->{text} eq $text;
1139
1140 delete $self->{texture};
1141
1142 $self->{last_activity} = $::NOW;
644 $self->{text} = $text; 1143 $self->{text} = $text;
645 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
646 1144
1145 $text =~ s/./*/g if $self->{hidden};
1146 $self->{layout}->set_text ("$text ");
1147
1148 $self->emit (changed => $self->{text});
1149}
1150
1151sub get_text {
1152 $_[0]{text}
1153}
1154
1155sub size_request {
1156 my ($self) = @_;
1157
1158 my ($w, $h) = $self->SUPER::size_request;
1159
1160 ($w + 1, $h) # add 1 for cursor
1161}
1162
1163sub size_allocate {
1164 my ($self, $w, $h) = @_;
1165
1166 $self->_set_text ($self->{text});
1167}
1168
1169sub set_text {
1170 my ($self, $text) = @_;
1171
1172 $self->{cursor} = length $text;
1173 $self->_set_text ($text);
647 $self->update; 1174 $self->update;
648} 1175}
649 1176
650sub get_text { 1177sub key_down {
651 my ($self, $text) = @_; 1178 my ($self, $ev) = @_;
652 1179
653 $self->{text} 1180 my $mod = $ev->{mod};
1181 my $sym = $ev->{sym};
1182 my $uni = $ev->{unicode};
1183
1184 my $text = $self->get_text;
1185
1186 if ($sym == 8) {
1187 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1188 } elsif ($sym == 127) {
1189 substr $text, $self->{cursor}, 1, "";
1190 } elsif ($sym == CFClient::SDLK_LEFT) {
1191 --$self->{cursor} if $self->{cursor};
1192 } elsif ($sym == CFClient::SDLK_RIGHT) {
1193 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1194 } elsif ($sym == CFClient::SDLK_HOME) {
1195 $self->{cursor} = 0;
1196 } elsif ($sym == CFClient::SDLK_END) {
1197 $self->{cursor} = length $text;
1198 } elsif ($sym == 27) {
1199 $self->emit ('escape');
1200 } elsif ($uni) {
1201 substr $text, $self->{cursor}++, 0, chr $uni;
1202 }
1203
1204 $self->_set_text ($text);
1205 $self->update;
1206}
1207
1208sub focus_in {
1209 my ($self) = @_;
1210
1211 $self->{last_activity} = $::NOW;
1212
1213 $self->SUPER::focus_in;
1214}
1215
1216sub button_down {
1217 my ($self, $ev, $x, $y) = @_;
1218
1219 $self->SUPER::button_down ($ev, $x, $y);
1220
1221 my $idx = $self->{layout}->xy_to_index ($x, $y);
1222
1223 # byte-index to char-index
1224 my $text = $self->{text};
1225 utf8::encode $text;
1226 $self->{cursor} = length substr $text, 0, $idx;
1227
1228 $self->_set_text ($self->{text});
1229 $self->update;
1230}
1231
1232sub mouse_motion {
1233 my ($self, $ev, $x, $y) = @_;
1234# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1235}
1236
1237sub _draw {
1238 my ($self) = @_;
1239
1240 local $self->{fg} = $self->{fg};
1241
1242 if ($FOCUS == $self) {
1243 glColor @{$self->{active_bg}};
1244 $self->{fg} = $self->{active_fg};
1245 } else {
1246 glColor @{$self->{bg}};
1247 }
1248
1249 glEnable GL_BLEND;
1250 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1251 glBegin GL_QUADS;
1252 glVertex 0 , 0;
1253 glVertex 0 , $self->{h};
1254 glVertex $self->{w}, $self->{h};
1255 glVertex $self->{w}, 0;
1256 glEnd;
1257 glDisable GL_BLEND;
1258
1259 $self->SUPER::_draw;
1260
1261 #TODO: force update every cursor change :(
1262 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1263
1264 unless (exists $self->{cur_h}) {
1265 my $text = substr $self->{text}, 0, $self->{cursor};
1266 utf8::encode $text;
1267
1268 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1269 }
1270
1271 glColor @{$self->{fg}};
1272 glBegin GL_LINES;
1273 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1274 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1275 glEnd;
1276 }
1277}
1278
1279package CFClient::UI::Entry;
1280
1281our @ISA = CFClient::UI::EntryBase::;
1282
1283use SDL::OpenGL;
1284
1285sub key_down {
1286 my ($self, $ev) = @_;
1287
1288 my $sym = $ev->{sym};
1289
1290 if ($sym == 13) {
1291 $self->emit (activate => $self->get_text);
1292 $self->update;
1293
1294 } else {
1295 $self->SUPER::key_down ($ev);
1296 }
1297
1298}
1299
1300#############################################################################
1301
1302package CFClient::UI::Button;
1303
1304our @ISA = CFClient::UI::Label::;
1305
1306use SDL::OpenGL;
1307
1308my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1310 qw(b1_button_active.png);
1311
1312sub new {
1313 my $class = shift;
1314
1315 $class->SUPER::new (
1316 padding => 4,
1317 fg => [1, 1, 1],
1318 bg => [1, 1, 1, 0.2],
1319 active_fg => [0, 0, 1],
1320 can_hover => 1,
1321 align => 0,
1322 valign => 0,
1323 @_
1324 )
1325}
1326
1327sub button_up {
1328 my ($self, $ev, $x, $y) = @_;
1329
1330 if ($x >= 0 && $x < $self->{w}
1331 && $y >= 0 && $y < $self->{h}) {
1332 $self->emit ("activate");
1333 }
1334}
1335
1336sub _draw {
1337 my ($self) = @_;
1338
1339 local $self->{fg} = $self->{fg};
1340
1341 if ($GRAB == $self) {
1342 $self->{fg} = $self->{active_fg};
1343 }
1344
1345 glEnable GL_BLEND;
1346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1347 glEnable GL_TEXTURE_2D;
1348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1349 glColor 0, 0, 0, 1;
1350
1351 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1352
1353 glDisable GL_TEXTURE_2D;
1354 glDisable GL_BLEND;
1355
1356 $self->SUPER::_draw;
1357}
1358
1359#############################################################################
1360
1361package CFClient::UI::CheckBox;
1362
1363our @ISA = CFClient::UI::DrawBG::;
1364
1365my @tex =
1366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1367 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1368
1369use SDL::OpenGL;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 padding => 2,
1376 fg => [1, 1, 1],
1377 active_fg => [1, 1, 0],
1378 state => 0,
1379 can_hover => 1,
1380 @_
1381 )
654} 1382}
655 1383
656sub size_request { 1384sub size_request {
657 my ($self) = @_; 1385 my ($self) = @_;
658 1386
659 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 1387 ($self->{padding} * 2 + 6) x 2
660 ( 1388}
661 $self->{texture}{width},
662 $self->{texture}{height},
663 )
664 } else {
665 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
666 1389
667 ($w, $h) 1390sub button_down {
668 } 1391 my ($self, $ev, $x, $y) = @_;
669 1392
1393 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1394 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1395 $self->{state} = !$self->{state};
1396 $self->emit (changed => $self->{state});
1397 }
670} 1398}
671 1399
672sub _draw { 1400sub _draw {
673 my ($self) = @_; 1401 my ($self) = @_;
674 1402
675 my $tex = $self->{texture}; 1403 $self->SUPER::_draw;
1404
1405 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1406
1407 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1408
1409 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
676 1410
677 glEnable GL_BLEND; 1411 glEnable GL_BLEND;
678 glEnable GL_TEXTURE_2D; 1412 glEnable GL_TEXTURE_2D;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1414
1415 my $tex = $self->{state} ? $tex[1] : $tex[0];
1416
1417 $tex->draw_quad (0, 0, $s, $s);
1418
1419 glDisable GL_TEXTURE_2D;
1420 glDisable GL_BLEND;
1421}
1422
1423#############################################################################
1424
1425package CFClient::UI::VGauge;
1426
1427our @ISA = CFClient::UI::Base::;
1428
1429use SDL::OpenGL;
1430
1431my %tex = (
1432 food => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1435 ],
1436 grace => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1439 ],
1440 hp => [
1441 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1442 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1443 ],
1444 mana => [
1445 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1446 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1447 ],
1448);
1449
1450# eg. VGauge->new (gauge => 'food'), default gauge: food
1451sub new {
1452 my $class = shift;
1453
1454 my $self = $class->SUPER::new (gauge => 'food', @_);
1455
1456 $self
1457}
1458
1459sub size_request {
1460 my ($self) = @_;
1461
1462 my $tex = $tex{$self->{gauge}}[0];
1463
1464 @$tex{qw(w h)}
1465}
1466
1467sub set_max {
1468 my ($self, $max) = @_;
1469
1470 $self->{max_val} = $max;
1471}
1472
1473sub set_value {
1474 my ($self, $val, $max) = @_;
1475
1476 $self->set_max ($max)
1477 if defined $max;
1478
1479 $max = $self->{max_val};
1480 $self->{val} = $val;
1481
1482 $self->update;
1483}
1484
1485sub _draw {
1486 my ($self) = @_;
1487
1488 my $tex = $tex{$self->{gauge}};
1489
1490 my ($w, $h) = ($self->{w}, $self->{h});
1491
1492 my $ycut = $self->{val} / ($self->{max_val} || 1);
1493 $ycut = 1 if $self->{val} > $self->{max_val};
1494
1495 my $t1 = $tex->[0];
1496 my $t2 = $tex->[1];
1497
1498 glEnable GL_BLEND;
1499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1500 glEnable GL_TEXTURE_2D;
680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
681 1502
682 glColor 1, 0, 0, 1; # TODO color 1503 my $h1 = $self->{h} - $ycut * $self->{h};
1504 my $h2 = $ycut * $self->{h};
683 1505
684 $tex->draw_quad (0, 0); 1506 my $yp = 0;
1507
1508 glBindTexture GL_TEXTURE_2D, $t1->{name};
1509 glBegin GL_QUADS;
1510 glTexCoord 0 , 0; glVertex 0 , $yp;
1511 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1512 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1513 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1514 glEnd;
1515
1516 $yp += $h1;
1517
1518 glBindTexture GL_TEXTURE_2D, $t2->{name};
1519 glBegin GL_QUADS;
1520 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1521 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1522 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1523 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1524 glEnd;
685 1525
686 glDisable GL_BLEND; 1526 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 1527 glDisable GL_TEXTURE_2D;
688} 1528}
689 1529
690############################################################################# 1530#############################################################################
691 1531
692package Crossfire::Client::Widget::Entry; 1532package CFClient::UI::Slider;
693 1533
694our @ISA = Crossfire::Client::Widget::Label::; 1534use strict;
695 1535
696use SDL;
697use SDL::OpenGL; 1536use SDL::OpenGL;
698 1537
699sub key_down { 1538our @ISA = CFClient::UI::DrawBG::;
1539
1540my @tex =
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1542 qw(s1_slider.png s1_slider_bg.png);
1543
1544sub new {
1545 my $class = shift;
1546
1547 # range [value, low, high, page]
1548
1549 # TODO: 0-width page
1550 # TODO: req_w/h are wrong with vertical
1551 # TODO: calculations are off
1552 my $self = $class->SUPER::new (
1553 fg => [1, 1, 1],
1554 active_fg => [0, 0, 0],
1555 range => [0, 0, 100, 10],
1556 req_w => 20,
1557 req_h => 20,
1558 vertical => 0,
1559 can_hover => 1,
1560 inner_pad => 5,
1561 @_
1562 );
1563
1564 $self
1565}
1566
1567sub size_request {
700 my ($self, $ev) = @_; 1568 my ($self) = @_;
701 1569
702 my $mod = $ev->key_mod; 1570 my $w = $self->{req_w};
703 my $sym = $ev->key_sym; 1571 my $h = $self->{req_h};
704 1572
705 my $uni = $ev->key_unicode; 1573 $self->{vertical} ? ($h, $w) : ($w, $h)
706
707 my $text = $self->get_text;
708
709 if ($sym == SDLK_BACKSPACE) {
710 substr $text, -1, 1, '';
711 } elsif ($uni) {
712 $text .= chr $uni;
713 print "$uni <$text>\n";#d#
714 }
715
716 $self->set_text ($text);
717} 1574}
718 1575
719sub button_down { 1576sub button_down {
1577 my ($self, $ev, $x, $y) = @_;
1578
1579 $self->SUPER::button_down ($ev, $x, $y);
1580 $self->mouse_motion ($ev, $x, $y);
1581}
1582
1583sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_;
1585
1586 if ($GRAB == $self) {
1587 my ($value, $lo, $hi, $page) = @{$self->{range}};
1588
1589 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1590
1591 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1592 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1593
1594 $x -= $inner_pad_px; # substract the padding
1595 $x = $x * ($hi - $lo) / $inner_w + $lo;
1596 $x = $lo if $x < $lo;
1597 $x = $hi - $page if $x > $hi - $page;
1598 $self->{range}[0] = $x;
1599
1600 $self->emit (changed => $x);
1601 $self->update;
1602 }
1603}
1604
1605# the inner_* stuff is for generating a padding for the slider handle,
1606# so that the handle doesn't leave the texture. This calculation isn't 100%
1607# correct propably, but it does the job for now
1608sub _calc_inner_pad_px {
720 my ($self, $ev) = @_; 1609 my ($self, $w) = @_;
721 1610 ($w / 100) * $self->{inner_pad} # % to pixels
722 $self->focus_in;
723} 1611}
724 1612
725sub _draw { 1613sub _draw {
726 my ($self) = @_; 1614 my ($self) = @_;
727 1615
728 if ($FOCUS == $self) {
729 glColor 1, 1, 1;
730 } else {
731 glColor 0.7, 0.7, 0.7;
732 }
733
734 glBegin GL_QUADS;
735 glVertex 0 , 0;
736 glVertex 0 , $self->{h} - 1;
737 glVertex $self->{w} - 1, $self->{h} - 1;
738 glVertex $self->{w} - 1, 0;
739 glEnd;
740
741 $self->SUPER::_draw; 1616 $self->SUPER::_draw ();
742}
743 1617
744############################################################################# 1618 my ($w, $h) = @$self{qw(w h)};
745 1619
746package Crossfire::Client::Widget::MapWidget; 1620 if ($self->{vertical}) {
1621 # draw a vertical slider like a rotated horizontal slider
1622
1623 glRotate 90, 0, 0, 1;
1624 glTranslate 0, -$self->{w}, 0;
747 1625
748use strict; 1626 ($w, $h) = ($h, $w);
1627 }
749 1628
750use List::Util qw(min max); 1629 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1630 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
751 1631
752use SDL; 1632 my ($value, $lo, $hi, $page) = @{$self->{range}};
1633
1634 $hi = $value + 1 if $lo == $hi;
1635
1636 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1637 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1638
1639 $page = int $page * $inner_w / ($hi - $lo);
1640 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1641
1642 $w -= $page;
1643 $page &= ~1;
1644 glTranslate $page * 0.5, 0, 0;
1645 $page ||= 2;
1646
1647 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1648 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1649
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655 # draw background
1656 $tex[1]->draw_quad (0, 0, $w, $h);
1657
1658 # draw handle
1659 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1660
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D;
1663}
1664
1665#############################################################################
1666
1667package CFClient::UI::TextView;
1668
1669our @ISA = CFClient::UI::HBox::;
1670
753use SDL::OpenGL; 1671use SDL::OpenGL;
754use SDL::OpenGL::Constants;
755 1672
756our @ISA = Crossfire::Client::Widget::; 1673sub new {
1674 my $class = shift;
757 1675
758sub key_down { 1676 my $self = $class->SUPER::new (
759 print "MAPKEYDOWN\n"; 1677 fontsize => 1,
760} 1678 @_,
761 1679
762sub key_up { 1680 layout => (new CFClient::Layout),
763} 1681 par => [],
764 1682 height => 0,
765sub size_request { 1683 children => [
766 ( 1684 (new CFClient::UI::Empty expand => 1),
767 1 + int $::WIDTH / 32, 1685 (new CFClient::UI::Slider vertical => 1),
768 1 + int $::HEIGHT / 32, 1686 ],
769 ) 1687 );
1688
1689 $self->{children}[1]->connect (changed => sub {
1690 $self->update;
1691 });
1692
1693 $self
1694}
1695
1696sub set_fontsize {
1697 my ($self, $fontsize) = @_;
1698
1699 $self->{fontsize} = $fontsize;
1700 $self->reflow;
1701}
1702
1703sub text_height {
1704 my ($self, $text) = @_;
1705
1706 my $layout = $self->{layout};
1707
1708 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1709 $layout->set_width ($self->{w});
1710 $layout->set_text ($text);
1711
1712 ($layout->size)[1]
1713}
1714
1715sub reflow {
1716 my ($self) = @_;
1717
1718 $self->{need_reflow}++;
1719 $self->update;
1720}
1721
1722sub size_allocate {
1723 my ($self, $w, $h) = @_;
1724
1725 $self->SUPER::size_allocate ($w, $h);
1726
1727 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1728 $self->{layout}->set_width ($self->{children}[0]{w});
1729
1730 $self->reflow;
1731}
1732
1733sub add_paragraph {
1734 my ($self, $color, $text) = @_;
1735
1736 #TODO: intelligently "reformat" paragraph
1737
1738 my $height = $self->text_height ($text);
1739
1740 $self->{height} += $height;
1741
1742 push @{$self->{par}}, [$height, $color, $text];
1743
1744 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1745 $self->{children}[1]->update;
1746}
1747
1748sub update {
1749 my ($self) = @_;
1750
1751 $self->SUPER::update;
1752
1753 return unless $self->{h} > 0;
1754
1755 delete $self->{texture};
1756
1757 $ROOT->on_refresh ($self, sub {
1758 if (delete $self->{need_reflow}) {
1759 my $height = 0;
1760
1761 $height += $_->[0] = $self->text_height ($_->[2])
1762 for @{$self->{par}};
1763
1764 $self->{height} = $height;
1765
1766 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1767
1768 delete $self->{texture};
1769 }
1770
1771 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1772 glClearColor 0, 0, 0, 1;
1773 glClear GL_COLOR_BUFFER_BIT;
1774
1775 glEnable GL_BLEND;
1776 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1777 glEnable GL_TEXTURE_2D;
1778 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1779
1780 my $top = int $self->{children}[1]{range}[0];
1781
1782 my $y0 = $top;
1783 my $y1 = $top + $self->{h};
1784
1785 my $y = 0;
1786
1787 my $layout = $self->{layout};
1788
1789 for my $par (@{$self->{par}}) {
1790 my $h = $par->[0];
1791
1792 if ($y0 < $y + $h && $y < $y1) {
1793 $layout->set_text ($par->[2]);
1794
1795 glColor @{ $par->[1] };
1796 my ($W, $H) = $layout->size;
1797 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1798 }
1799
1800 $y += $h;
1801 }
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 };
1806 });
770} 1807}
771 1808
772sub _draw { 1809sub _draw {
773 my ($self) = @_; 1810 my ($self) = @_;
774 1811
775 my $mx = $::CONN->{mapx}; 1812 if ($self->{texture}) {
776 my $my = $::CONN->{mapy};
777
778 my $map = $::CONN->{map};
779
780 my ($xofs, $yofs);
781
782 my $sw = 1 + int $::WIDTH / 32;
783 my $sh = 1 + int $::HEIGHT / 32;
784
785 if ($::CONN->{mapw} > $sw) {
786 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
787 } else {
788 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
789 }
790
791 if ($::CONN->{maph} > $sh) {
792 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
793 } else {
794 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
795 }
796
797 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
798 glEnable GL_BLEND;
799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
800 1815 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
801 my $sw4 = ($sw + 3) & ~3;
802 my $darkness = "\x00" x ($sw4 * $sh);
803
804 for my $x (0 .. $sw - 1) {
805 my $row = $map->[$x + $xofs];
806 for my $y (0 .. $sh - 1) {
807
808 my $cell = $row->[$y + $yofs]
809 or next;
810
811 my $dark = $cell->[0];
812 if ($dark < 0) {
813 substr $darkness, $y * $sw4 + $x, 1, chr 224;
814 } else {
815 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
816 }
817
818 for my $num (grep $_, @$cell[1,2,3]) {
819 my $tex = $::CONN->{face}[$num]{texture} || next;
820
821 my $w = $tex->{width};
822 my $h = $tex->{height};
823
824 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
825 }
826 }
827 }
828
829# if (1) { # higher quality darkness
830# $lighting =~ s/(.)/$1$1$1/gs;
831# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
832#
833# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
834#
835# $lighting = $pb->get_pixels;
836# $lighting =~ s/(.)../$1/gs;
837# }
838
839 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841
842 $darkness = new Crossfire::Client::Texture
843 width => $sw4,
844 height => $sh,
845 data => $darkness,
846 internalformat => GL_ALPHA,
847 format => GL_ALPHA;
848
849 glColor 0.45, 0.45, 0.45, 1;
850 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
851
852 glDisable GL_TEXTURE_2D; 1816 glDisable GL_TEXTURE_2D;
853 glDisable GL_BLEND;
854}
855
856my %DIR = (
857 SDLK_KP8, [1, "north"],
858 SDLK_KP9, [2, "northeast"],
859 SDLK_KP6, [3, "east"],
860 SDLK_KP3, [4, "southeast"],
861 SDLK_KP2, [5, "south"],
862 SDLK_KP1, [6, "southwest"],
863 SDLK_KP4, [7, "west"],
864 SDLK_KP7, [8, "northwest"],
865
866 SDLK_UP, [1, "north"],
867 SDLK_RIGHT, [3, "east"],
868 SDLK_DOWN, [5, "south"],
869 SDLK_LEFT, [7, "west"],
870);
871
872sub key_down {
873 my ($self, $ev) = @_;
874
875 my $mod = $ev->key_mod;
876 my $sym = $ev->key_sym;
877
878 if ($sym == SDLK_KP5) {
879 $::CONN->send ("command stay fire");
880 } elsif (exists $DIR{$sym}) {
881 if ($mod & KMOD_SHIFT) {
882 $self->{shft}++;
883 $::CONN->send ("command fire $DIR{$sym}[0]");
884 } elsif ($mod & KMOD_CTRL) {
885 $self->{ctrl}++;
886 $::CONN->send ("command run $DIR{$sym}[0]");
887 } else {
888 $::CONN->send ("command $DIR{$sym}[1]");
889 }
890 } 1817 }
891}
892 1818
893sub key_up { 1819 $self->{children}[1]->draw;
894 my ($self, $ev) = @_;
895 1820
896 my $mod = $ev->key_mod;
897 my $sym = $ev->key_sym;
898
899 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
900 $::CONN->send ("command fire_stop");
901 }
902 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
903 $::CONN->send ("command run_stop");
904 }
905} 1821}
906 1822
907############################################################################# 1823#############################################################################
908 1824
909package Crossfire::Client::Widget::Animator; 1825package CFClient::UI::Animator;
910 1826
911use SDL::OpenGL; 1827use SDL::OpenGL;
912 1828
913our @ISA = Crossfire::Client::Widget::Bin::; 1829our @ISA = CFClient::UI::Bin::;
914 1830
915sub moveto { 1831sub moveto {
916 my ($self, $x, $y) = @_; 1832 my ($self, $x, $y) = @_;
917 1833
918 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1834 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
923} 1839}
924 1840
925sub animate { 1841sub animate {
926 my ($self, $interval) = @_; 1842 my ($self, $interval) = @_;
927 1843
928 printf "%5.2f\n", 1 / $interval if $interval;#d#
929
930 $self->{time} -= $interval * $self->{speed}; 1844 $self->{time} -= $interval * $self->{speed};
931 if ($self->{time} <= 0) { 1845 if ($self->{time} <= 0) {
932 $self->{time} = 0; 1846 $self->{time} = 0;
933 ::animation_stop $self; 1847 ::animation_stop $self;
934 } 1848 }
… …
948 glPopMatrix; 1862 glPopMatrix;
949} 1863}
950 1864
951############################################################################# 1865#############################################################################
952 1866
953package Crossfire::Client::Widget::Toplevel; 1867package CFClient::UI::Flopper;
954 1868
1869our @ISA = CFClient::UI::Button::;
1870
1871sub new {
1872 my $class = shift;
1873
1874 my $self = $class->SUPER::new (
1875 state => 0,
1876 connect_activate => \&toggle_flopper,
1877 @_
1878 );
1879
1880 if ($self->{state}) {
1881 $self->{state} = 0;
1882 $self->toggle_flopper;
1883 }
1884
1885 $self
1886}
1887
1888sub toggle_flopper {
1889 my ($self) = @_;
1890
1891 # TODO: use animation
1892 if ($self->{state} = !$self->{state}) {
1893 $CFClient::UI::ROOT->add ($self->{other});
1894 $self->{other}->move ($self->coord2global (0, $self->{h}));
1895 $self->emit ("open");
1896 } else {
1897 $CFClient::UI::ROOT->remove ($self->{other});
1898 $self->emit ("close");
1899 }
1900
1901 $self->emit (changed => $self->{state});
1902}
1903
1904#############################################################################
1905
1906package CFClient::UI::Root;
1907
955our @ISA = Crossfire::Client::Widget::Container::; 1908our @ISA = CFClient::UI::Container::;
1909
1910use SDL::OpenGL;
1911
1912sub check_size {
1913 my ($self) = @_;
1914
1915 $self->configure (0, 0, $::WITH, $::HEIGHT);
1916}
956 1917
957sub size_request { 1918sub size_request {
958 ($::WIDTH, $::HEIGHT) 1919 ($::WIDTH, $::HEIGHT)
959} 1920}
960 1921
961sub size_allocate { 1922sub configure {
962 my ($self, $w, $h) = @_; 1923 my ($self, $x, $y, $w, $h) = @_;
963 1924
964 $self->SUPER::size_allocate ($w, $h); 1925 $self->SUPER::configure ($x, $y, $w, $h);
965 1926
966 $_->size_allocate ($_->size_request) 1927 $_->configure ($_->{x}, $_->{y}, $_->size_request)
967 for @{$self->{children}}; 1928 for @{$self->{children}};
968} 1929}
969 1930
1931sub _topleft {
1932 my ($self, $x, $y) = @_;
1933
1934 ($x, $y)
1935}
1936
970sub update { 1937sub update {
971 my ($self) = @_; 1938 my ($self) = @_;
972 1939
973 $self->size_allocate ($self->size_request); 1940 $self->check_size;
974 ::refresh (); 1941 ::refresh ();
975} 1942}
976 1943
977sub add { 1944sub add {
978 my ($self, $widget) = @_; 1945 my ($self, $child) = @_;
979 1946
980 $self->SUPER::add ($widget); 1947 $self->SUPER::add ($child);
1948}
981 1949
982 $widget->size_allocate ($widget->size_request); 1950sub on_refresh {
1951 my ($self, $id, $cb) = @_;
1952
1953 $self->{refresh_hook}{$id} = $cb;
983} 1954}
984 1955
985sub draw { 1956sub draw {
986 my ($self) = @_; 1957 my ($self) = @_;
987 1958
1959 while (my $rcb = delete $self->{refresh_hook}) {
1960 $_->() for values %$rcb;
1961 }
1962
1963 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1964 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1965 glClear GL_COLOR_BUFFER_BIT;
1966
1967 glMatrixMode GL_PROJECTION;
1968 glLoadIdentity;
1969 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1970 glMatrixMode GL_MODELVIEW;
1971 glLoadIdentity;
1972
988 $self->_draw; 1973 $self->_draw;
989} 1974}
990 1975
991############################################################################# 1976#############################################################################
992 1977
993package Crossfire::Client::Widget; 1978package CFClient::UI;
994 1979
995$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1980$ROOT = new CFClient::UI::Root;
996 1981
9971 19821
998 1983

Diff Legend

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