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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines