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

Diff Legend

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