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.47 by root, Sun Apr 9 22:24:43 2006 UTC vs.
Revision 1.109 by root, Sat Apr 15 01:13:47 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
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 return unless $self->{can_focus};
150
151 my $focus = $FOCUS; $FOCUS = $self;
152 $focus->update if $focus;
153 $FOCUS->update;
50} 154}
51 155
52sub focus_out { 156sub focus_out {
53 my ($widget) = @_; 157 my ($self) = @_;
54}
55 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 { }
56sub key_down { 167sub key_down { }
57 my ($widget, $sdlev) = @_;
58}
59
60sub key_up { 168sub key_up { }
61 my ($widget, $sdlev) = @_;
62}
63 169
64sub button_down { 170sub button_down {
65 my ($widget, $sdlev) = @_; 171 my ($self, $ev, $x, $y) = @_;
66}
67 172
68sub button_up { 173 $self->focus_in;
69 my ($widget, $sdlev) = @_;
70} 174}
71 175
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 181
78sub draw { 182sub draw {
79 my ($self) = @_; 183 my ($self) = @_;
184
185 return unless $self->{h} && $self->{w};
80 186
81 glPushMatrix; 187 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 189 $self->_draw;
84 if ($self == $::HOVER) { 190 glPopMatrix;
85 glColor 1, 1, 1, 1; 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;
86 glBegin GL_LINES; 198 glBegin GL_QUADS;
87 glVertex 0, 0; 199 glVertex $x , $y;
88 glVertex $self->{w} - 1, 0; 200 glVertex $x + $self->{w}, $y;
89 glVertex $self->{w} - 1, $self->{h} - 1; 201 glVertex $x + $self->{w}, $y + $self->{h};
90 glVertex 0, $self->{h} - 1; 202 glVertex $x , $y + $self->{h};
91 glVertex 0, 0;
92 glEnd; 203 glEnd;
204 glDisable GL_BLEND;
93 } 205 }
94 glPopMatrix;
95} 206}
96 207
97sub _draw { 208sub _draw {
98 my ($self) = @_; 209 my ($self) = @_;
99 210
100 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
101}
102
103sub bbox {
104 my ($self) = @_;
105 my ($w, $h) = $self->size_request;
106 (
107 $self->{x},
108 $self->{y},
109 $self->{x} = $w,
110 $self->{y} = $h
111 )
112} 212}
113 213
114sub find_widget { 214sub find_widget {
115 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
116 216
119 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
120 220
121 () 221 ()
122} 222}
123 223
124sub del_parent { $_[0]->{parent} = undef }
125
126sub set_parent { 224sub set_parent {
127 my ($self, $par) = @_; 225 my ($self, $par) = @_;
128 226
129 $self->{parent} = $par; 227 $self->{parent} = $par;
130 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
139 237
140 $self->{parent}->update 238 $self->{parent}->update
141 if $self->{parent}; 239 if $self->{parent};
142} 240}
143 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
144sub DESTROY { 255sub DESTROY {
145 my ($self) = @_; 256 my ($self) = @_;
146 257
147 #$self->deactivate; 258 #$self->deactivate;
148} 259}
149 260
150############################################################################# 261#############################################################################
151 262
152package Crossfire::Client::Widget::Container; 263package CFClient::UI::DrawBG;
153 264
154our @ISA = Crossfire::Client::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
155 269
156sub 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 {
157 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
158 321
322 my $children = delete $arg{children} || [];
323
159 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
160 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
161 326
162 $self 327 $self
163} 328}
164 329
165sub add { 330sub add {
166 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
167 332
168 $chld->{expand} = $expand;
169 $chld->set_parent ($self); 333 $chld->set_parent ($self);
170 334
171 @{$self->{children}} = 335 $self->{children} = [
172 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
173 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
174 339
175 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
176 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
177} 342}
178 343
179sub remove { 344sub remove {
180 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
181 346
182 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
183 348
184 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
185} 350}
186 351
187sub find_widget { 352sub find_widget {
188 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
189 354
206 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
207} 372}
208 373
209############################################################################# 374#############################################################################
210 375
211package Crossfire::Client::Widget::Bin; 376package CFClient::UI::Bin;
212 377
213our @ISA = Crossfire::Client::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
214 379
215sub child { $_[0]->{children}[0] } 380sub new {
381 my ($class, %arg) = @_;
216 382
217sub size_request { 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
218 $_[0]{children}[0]->size_request if $_[0]{children}[0];
219}
220 384
221sub size_allocate { 385 $class->SUPER::new (children => [$child], %arg)
222 my ($self, $w, $h) = @_;
223
224 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h)
226 if $self->{children}[0]
227}
228
229#############################################################################
230
231package Crossfire::Client::Widget::Toplevel;
232
233our @ISA = Crossfire::Client::Widget::Container::;
234
235sub update {
236 my ($self) = @_;
237
238 ::refresh ();
239} 386}
240 387
241sub add { 388sub add {
242 my ($self, $widget) = @_; 389 my ($self, $widget) = @_;
243 390
391 $self->{children} = [];
392
244 $self->SUPER::add ($widget); 393 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247} 394}
248 395
249############################################################################# 396sub remove {
397 my ($self, $widget) = @_;
250 398
251package Crossfire::Client::Widget::Window; 399 $self->SUPER::remove ($widget);
252 400
253our @ISA = Crossfire::Client::Widget::Bin::; 401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
404
405sub child { $_[0]->{children}[0] }
406
407sub size_request {
408 $_[0]{children}[0]->size_request
409}
410
411sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_;
413
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
417}
418
419#############################################################################
420
421package CFClient::UI::Window;
422
423our @ISA = CFClient::UI::Bin::;
254 424
255use SDL::OpenGL; 425use SDL::OpenGL;
256 426
257sub new { 427sub new {
258 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
259 429
260 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
261
262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
263} 431}
264 432
265sub update { 433sub update {
266 my ($self) = @_; 434 my ($self) = @_;
267 435
436 # we want to do this delayed...
268 $self->render_chld; 437 $self->render_chld;
269 $self->SUPER::update; 438 $self->SUPER::update;
270} 439}
271 440
272sub render_chld { 441sub render_chld {
273 my ($self) = @_; 442 my ($self) = @_;
274 443
275 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
276 Crossfire::Client::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
277 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
278 ); 447 $self->child->draw;
448 };
279} 449}
280 450
281sub size_allocate { 451sub size_allocate {
282 my ($self, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
283 453
284 $self->{w} = $w; 454 $self->_size_allocate ($x, $y, $w, $h) or return;
285 $self->{h} = $h;
286 455
287 $self->child->size_allocate ($w, $h); 456 $self->child->size_allocate (0, 0, $w, $h);
288 457
289 $self->render_chld; 458 $self->render_chld;
290} 459}
291 460
292sub _draw { 461sub _draw {
296 465
297 my $tex = $self->{texture} 466 my $tex = $self->{texture}
298 or return; 467 or return;
299 468
300 glEnable GL_BLEND; 469 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
301 glEnable GL_TEXTURE_2D; 471 glEnable GL_TEXTURE_2D;
302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
303 glBindTexture GL_TEXTURE_2D, $tex->{name};
304 473
305 glBegin GL_QUADS; 474 $tex->draw_quad (0, 0, $w, $h);
306 glTexCoord 0, 0; glVertex 0, 0;
307 glTexCoord 0, 1; glVertex 0, $h;
308 glTexCoord 1, 1; glVertex $w, $h;
309 glTexCoord 1, 0; glVertex $w, 0;
310 glEnd;
311 475
312 glDisable GL_BLEND; 476 glDisable GL_BLEND;
313 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
314} 478}
315 479
316############################################################################# 480#############################################################################
317 481
318package Crossfire::Client::Widget::Frame; 482package CFClient::UI::Frame;
319 483
320our @ISA = Crossfire::Client::Widget::Bin::; 484our @ISA = CFClient::UI::Bin::;
321 485
322use SDL::OpenGL; 486use SDL::OpenGL;
323 487
324sub size_request { 488sub size_request {
325 my ($self) = @_; 489 my ($self) = @_;
330 494
331 map { $_ + 4 } $chld->size_request; 495 map { $_ + 4 } $chld->size_request;
332} 496}
333 497
334sub size_allocate { 498sub size_allocate {
335 my ($self, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
336 500
337 $self->{w} = $w; 501 $self->_size_allocate ($x, $y, $w, $h) or return;
338 $self->{h} = $h;
339 502
340 $self->child->size_allocate ($w - 4, $h - 4); 503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
341 $self->child->move (2, 2);
342} 504}
343 505
344sub _draw { 506sub _draw {
345 my ($self) = @_; 507 my ($self) = @_;
346 508
348 510
349 my ($w, $h) = $chld->size_request; 511 my ($w, $h) = $chld->size_request;
350 512
351 glBegin GL_QUADS; 513 glBegin GL_QUADS;
352 glColor 0, 0, 0; 514 glColor 0, 0, 0;
353 glTexCoord 0, 0; glVertex 0 , 0; 515 glVertex 0 , 0;
354 glTexCoord 0, 1; glVertex 0 , $h + 4; 516 glVertex 0 , $h + 4;
355 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 517 glVertex $w + 4 , $h + 4;
356 glTexCoord 1, 0; glVertex $w + 4 , 0; 518 glVertex $w + 4 , 0;
357 glEnd; 519 glEnd;
358 520
359 $chld->draw; 521 $chld->draw;
360} 522}
361 523
362############################################################################# 524#############################################################################
363 525
364package Crossfire::Client::Widget::FancyFrame; 526package CFClient::UI::FancyFrame;
365 527
366our @ISA = Crossfire::Client::Widget::Bin::; 528our @ISA = CFClient::UI::Bin::;
367 529
368use SDL::OpenGL; 530use SDL::OpenGL;
369 531
370my @tex = 532my @tex =
371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
372 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
373 535
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
374sub size_request { 549sub size_request {
375 my ($self) = @_; 550 my ($self) = @_;
376 551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
377 my ($w, $h) = $self->SUPER::size_request; 554 my ($w, $h) = $self->SUPER::size_request;
378 555
379 $h += $tex[1]->{height}; 556 (
380 $h += $tex[4]->{height}; 557 $w + $self->{border} * 2,
381 $w += $tex[2]->{width}; 558 $h + $self->{border} * 2,
382 $w += $tex[3]->{width}; 559 )
383
384 ($w, $h)
385} 560}
386 561
387sub size_allocate { 562sub size_allocate {
388 my ($self, $w, $h) = @_; 563 my ($self, $x, $y, $w, $h) = @_;
389 564
390 $self->SUPER::size_allocate ($w, $h); 565 $self->_size_allocate ($x, $y, $w, $h) or return;
391 566
392 $h -= $tex[1]->{height}; 567 $h -= List::Util::max 0, $self->{border} * 2;
393 $h -= $tex[4]->{height}; 568 $w -= List::Util::max 0, $self->{border} * 2;
394 $w -= $tex[2]->{width};
395 $w -= $tex[3]->{width};
396 569
397 $h = $h < 0 ? 0 : $h; 570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
398 $w = $w < 0 ? 0 : $w; 571}
399 572
400 $self->child->size_allocate ($w, $h); 573sub button_down {
401 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 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};
402} 619}
403 620
404sub _draw { 621sub _draw {
405 my ($self) = @_; 622 my ($self) = @_;
406 623
407 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h ) = ($self->{w}, $self->{h});
408 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
409 626
410 glEnable GL_BLEND; 627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
411 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
414 631
415 my $top = $tex[1]; 632 glColor @{ $self->{border_bg} };
416 glBindTexture GL_TEXTURE_2D, $top->{name}; 633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
417 634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
418 glBegin GL_QUADS; 635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
419 glTexCoord 0, 0; glVertex 0 , 0; 636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
420 glTexCoord 0, 1; glVertex 0 , $top->{height};
421 glTexCoord 1, 1; glVertex $w , $top->{height};
422 glTexCoord 1, 0; glVertex $w , 0;
423 glEnd;
424
425 my $left = $tex[3];
426 glBindTexture GL_TEXTURE_2D, $left->{name};
427
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , $top->{height};
430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
433 glEnd;
434
435 my $right = $tex[2];
436 glBindTexture GL_TEXTURE_2D, $right->{name};
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $w , $top->{height};
443 glEnd;
444
445 my $bottom = $tex[4];
446 glBindTexture GL_TEXTURE_2D, $bottom->{name};
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
450 glTexCoord 0, 1; glVertex 0 , $h;
451 glTexCoord 1, 1; glVertex $w , $h;
452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
453 glEnd;
454 637
455 my $bg = $tex[0]; 638 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 639
640 # TODO: repeat texture not scale
461 my $rep_x = $cw / $bg->{width}; 641 my $rep_x = $cw / $bg->{w};
462 my $rep_y = $ch / $bg->{height}; 642 my $rep_y = $ch / $bg->{h};
463 643
464 glBegin GL_QUADS; 644 glColor @{ $self->{bg} };
465 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
466 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
467 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
468 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
469 glEnd;
470 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;
471 glDisable GL_BLEND; 652 glDisable GL_BLEND;
472 glDisable GL_TEXTURE_2D;
473 653
474 $self->child->draw; 654 $self->child->draw;
475
476} 655}
477 656
478############################################################################# 657#############################################################################
479 658
480package Crossfire::Client::Widget::Table; 659package CFClient::UI::Table;
481 660
482our @ISA = Crossfire::Client::Widget::Bin::; 661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
483 664
484use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
485 675
486sub add { 676sub add {
487 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
488 my $old_chld = $self->{children}[$y][$x];
489 678
490 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
491 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
492 $self->update; 683 $self->update;
493} 684}
494 685
495sub max_row_height { 686sub get_wh {
496 my ($self, $row) = @_; 687 my ($self) = @_;
497 688
498 my $hs = 0; 689 my (@w, @h);
499 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 690
691 for my $y (0 .. $#{$self->{children}}) {
500 my $c = $self->{children}->[$row]->[$xi]; 692 my $row = $self->{children}[$y]
501 if ($c) { 693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
502 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
503 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
504 } 702 }
505 } 703 }
506 return $hs;
507}
508 704
509sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
510 my ($self, $col) = @_; 709 my ($self) = @_;
511 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
512 my $ws = 0; 747 my $x = 0;
513 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 748 my $row_h = $hs->[$r];
514 my $c = ($self->{children}->[$yi] || [])->[$col]; 749
515 if ($c) { 750 for my $c (0 .. $#$row) {
516 my ($w, $h) = $c->size_request; 751 my $col_w = $ws->[$c];
517 if ($ws < $w) { $ws = $w } 752
753 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h);
755 }
756
757 $x += $col_w;
518 } 758 }
759
760 $y += $row_h;
519 } 761 }
520 return $ws; 762
521} 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::;
522 796
523sub size_request { 797sub size_request {
524 my ($self) = @_; 798 my ($self) = @_;
525 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
526 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
527 814
528 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my $children = $self->{children};
529 $hs += $self->max_row_height ($yi);
530 }
531 816
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
533 my $wm = 0; 818
534 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
535 $wm += $self->max_col_width ($xi) 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;
536 } 834 }
537 if ($ws < $wm) { $ws = $wm }
538 } 835 }
539
540 return ($ws, $hs);
541}
542
543sub _draw {
544 my ($self) = @_;
545 836
546 my $y = 0; 837 my $y = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 838 for (0 .. $#$children) {
548 my $x = 0; 839 my $child = $children->[$_];
840 my $h = int $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
549 842
550 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 843 $y += $h;
551
552 my $c = $self->{children}->[$yi]->[$xi];
553 if ($c) {
554 $c->move ($x, $y, 0); #TODO: Move to size_request
555 $c->draw if $c;
556 }
557
558 $x += $self->max_col_width ($xi);
559 }
560
561 $y += $self->max_row_height ($yi);
562 } 844 }
563} 845}
564 846
565############################################################################# 847#############################################################################
566 848
567package Crossfire::Client::Widget::VBox; 849package CFClient::UI::VBox;
568 850
851# TODO: wrap into common Box base class
852
569our @ISA = Crossfire::Client::Widget::Container::; 853our @ISA = CFClient::UI::Container::;
570
571use SDL::OpenGL;
572 854
573sub size_request { 855sub size_request {
574 my ($self) = @_; 856 my ($self) = @_;
575 857
576 my @alloc = map [$_->size_request], @{$self->{children}}; 858 my @alloc = map [$_->size_request], @{$self->{children}};
580 (List::Util::sum map $_->[1], @alloc), 862 (List::Util::sum map $_->[1], @alloc),
581 ) 863 )
582} 864}
583 865
584sub size_allocate { 866sub size_allocate {
585 my ($self, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
586 868
587 $self->w ($w); 869 $self->_size_allocate ($x, $y, $w, $h);
588 $self->h ($h);
589 870
590 my $exp; 871 my $children = $self->{children};
591 my @oth; 872
592 # find expand widget 873 my @h = map +($_->size_request)[1], @$children;
593 for (@{$self->{children}}) { 874
594 if ($_->{expand}) { 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;
595 $exp = $_; 882 $exp ||= 1;
596 last; 883
884 for (0 .. $#$children) {
885 my $child = $children->[$_];
886
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
597 } 888 }
598 push @oth, $_;
599 }
600
601 my ($ow, $oh);
602
603 # get sizes of other widgets
604 for (@oth) {
605 my ($w, $h) = $_->size_request;
606 $oh += $h;
607 if ($ow < $w) { $ow = $w }
608 } 889 }
609 890
610 my $y = 0; 891 my $y = 0;
611 for (@{$self->{children}}) { 892 for (0 .. $#$children) {
612 $_->move (0, $y); 893 my $child = $children->[$_];
613 894 my $h = int $h[$_];
614 if ($_ == $exp) {
615 $_->size_allocate ($w, $h - $oh);
616 $y += $h - $oh;
617 } else {
618 my ($cw, $h) = $_->size_request;
619 $_->size_allocate ($w, $h); 895 $child->size_allocate (0, $y, $w, $h);
896
620 $y += $h; 897 $y += $h;
621 }
622 } 898 }
623} 899}
624 900
625############################################################################# 901#############################################################################
626 902
627package Crossfire::Client::Widget::Label; 903package CFClient::UI::Label;
628 904
629our @ISA = Crossfire::Client::Widget::; 905our @ISA = CFClient::UI::Base::;
630 906
631use SDL::OpenGL; 907use SDL::OpenGL;
632 908
633sub new { 909sub new {
634 my ($class, $x, $y, $z, $height, $text) = @_; 910 my ($class, %arg) = @_;
635 911
636 # TODO: color, and make height, xyz etc. optional 912 my $self = $class->SUPER::new (
637 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 913 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE,
915 text => "",
916 align => -1,
917 padding => 2,
918 layout => new CFClient::Layout,
919 %arg
920 );
638 921
639 $self->set_text ($text); 922 $self->set_text ($self->{text});
640 923
641 $self 924 $self
925}
926
927sub escape_text {
928 local $_ = $_[1];
929
930 s/&/&amp;/g;
931 s/>/&gt;/g;
932 s/</&lt;/g;
933
934 $_[1]
642} 935}
643 936
644sub set_text { 937sub set_text {
645 my ($self, $text) = @_; 938 my ($self, $text) = @_;
646 939
647 $self->{text} = $text; 940 $self->{text} = $text;
648 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 941 $self->{layout}->set_markup ($text);
649 942
943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
650 $self->update; 945 $self->update;
651} 946}
652 947
653sub get_text { 948sub get_text {
654 my ($self, $text) = @_; 949 my ($self, $text) = @_;
657} 952}
658 953
659sub size_request { 954sub size_request {
660 my ($self) = @_; 955 my ($self) = @_;
661 956
957 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{fontsize});
959 my ($w, $h) = $self->{layout}->size;
960
662 ( 961 (
663 $self->{texture}{width}, 962 $w + $self->{padding} * 2,
664 $self->{texture}{height}, 963 $h + $self->{padding} * 2,
665 ) 964 )
666} 965}
667 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
668sub _draw { 982sub _draw {
669 my ($self) = @_; 983 my ($self) = @_;
670 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
1059 my ($w, $h) = $self->SUPER::size_request;
1060
1061 ($w + 1, $h) # add 1 for cursor
1062}
1063
1064sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_;
1066
1067 $self->SUPER::size_allocate ($x, $y, $w, $h);
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
671 my $tex = $self->{texture}; 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#
1139}
1140
1141sub _draw {
1142 my ($self) = @_;
1143
1144 local $self->{fg} = $self->{fg};
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];
672 1237
673 glEnable GL_BLEND; 1238 glEnable GL_BLEND;
674 glEnable GL_TEXTURE_2D; 1239 glEnable GL_TEXTURE_2D;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241
1242 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg};
1244 }
1245
677 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1246 glBindTexture GL_TEXTURE_2D, $tex->{name};
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678 1248
679 glColor 1, 0, 0, 1; # TODO color 1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
680 1250
681 glBegin GL_QUADS; 1251 glDisable GL_TEXTURE_2D;
682 glTexCoord 0, 0; glVertex 0 , 0; 1252 glDisable GL_BLEND;
683 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 1253
684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 1254 $self->SUPER::_draw;
685 glTexCoord 1, 0; glVertex $tex->{width}, 0; 1255}
686 glEnd; 1256
1257#############################################################################
1258
1259package CFClient::UI::CheckBox;
1260
1261our @ISA = CFClient::UI::DrawBG::;
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;
1268use SDL::OpenGL;
1269
1270sub new {
1271 my $class = shift;
1272
1273 $class->SUPER::new (
1274 padding => 2,
1275 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0],
1277 state => 0,
1278 can_hover => 1,
1279 @_
1280 )
1281}
1282
1283sub size_request {
1284 my ($self) = @_;
1285
1286 ($self->{padding} * 2 + 6) x 2
1287}
1288
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
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 }
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 $self->SUPER::_draw;
1309
1310 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1311
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1313
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315
1316 glEnable GL_BLEND;
1317 glEnable GL_TEXTURE_2D;
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;
1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1452
1453 # draw background
1454 $tex[1]->draw_quad (0, 0, $w, $h);
1455
1456 # draw handle
1457 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
687 1458
688 glDisable GL_BLEND; 1459 glDisable GL_BLEND;
689 glDisable GL_TEXTURE_2D; 1460 glDisable GL_TEXTURE_2D;
690} 1461}
691 1462
692############################################################################# 1463#############################################################################
693 1464
694package Crossfire::Client::Widget::TextEntry; 1465package CFClient::UI::TextView;
695 1466
696our @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);
697 1636
698use SDL; 1637use SDL;
699use SDL::OpenGL; 1638use SDL::OpenGL;
700 1639
701sub key_down { 1640our @ISA = CFClient::UI::Base::;
702 my ($self, $ev) = @_;
703 1641
704 my $mod = $ev->key_mod; 1642sub new {
705 my $sym = $ev->key_sym; 1643 my $class = shift;
706 1644
707 $ev->set_unicode (1); 1645 $class->SUPER::new (
708 my $uni = $ev->key_unicode; 1646 z => -1,
709 1647 can_focus => 1,
710 my $text = $self->get_text; 1648 list => (glGenLists 1),
711 1649 @_
712 if ($sym == SDLK_BACKSPACE) {
713 substr $text, -1, 1, '';
714
715 } elsif ($uni) {
716 $text .= chr $uni;
717 } 1650 )
718 $self->set_text ($text);
719} 1651}
720
721#############################################################################
722
723package Crossfire::Client::Widget::MapWidget;
724
725use strict;
726
727use List::Util qw(min max);
728
729use SDL;
730use SDL::OpenGL;
731use SDL::OpenGL::Constants;
732
733our @ISA = Crossfire::Client::Widget::;
734 1652
735sub key_down { 1653sub key_down {
736 print "MAPKEYDOWN\n"; 1654 print "MAPKEYDOWN\n";
737} 1655}
738 1656
739sub key_up { 1657sub key_up {
740} 1658}
741 1659
1660sub button_down {
1661 my ($self, $ev, $x, $y) = @_;
1662
1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
1686}
1687
1688sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_;
1690
1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
1692}
1693
742sub size_request { 1694sub size_request {
743 1695 (
1696 1 + 32 * int $::WIDTH / 32,
1697 1 + 32 * int $::HEIGHT / 32,
1698 )
744} 1699}
745 1700
746sub size_allocate { 1701sub update {
747} 1702 my ($self) = @_;
748 1703
1704 $self->{need_update} = 1;
1705 $self->SUPER::update;
1706}
1707
749sub _draw { 1708sub draw {
750 my ($self) = @_; 1709 my ($self) = @_;
751 1710
752 my $mx = $::CONN->{mapx}; 1711 if (delete $self->{need_update}) {
753 my $my = $::CONN->{mapy}; 1712 glNewList $self->{list}, GL_COMPILE;
754 1713
755 my $map = $::CONN->{map}; 1714 if ($::MAP) {
756
757 my ($xofs, $yofs);
758
759 my $sw = 1 + int $::WIDTH / 32; 1715 my $sw = int $::WIDTH / 32;
760 my $sh = 1 + int $::HEIGHT / 32; 1716 my $sh = int $::HEIGHT / 32;
761 1717
762 if ($::CONN->{mapw} > $sw) { 1718 my $sx = $::CFG->{map_shift_x};
763 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1719 my $sy = $::CFG->{map_shift_y};
764 } else {
765 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
766 }
767 1720
768 if ($::CONN->{maph} > $sh) { 1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
769 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
770 } else {
771 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
772 }
773 1722
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1724
1725 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D
1729 GL_CONVOLUTION_2D,
1730 GL_ALPHA,
1731 3, 3,
1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1737 ;
1738 glEnable GL_CONVOLUTION_2D;
1739 }
1740
1741 my $tex = new CFClient::Texture
1742 w => $w,
1743 h => $h,
1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1747
1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1749
1750 glEnable GL_BLEND;
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
774 glEnable GL_TEXTURE_2D; 1752 glEnable GL_TEXTURE_2D;
775 glEnable GL_BLEND;
776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
777 1754
778 my $sw4 = ($sw + 3) & ~3; 1755 glColor +($::CFG->{fow_intensity}) x 3, 1;
779 my $lighting = "\x00" x ($sw4 * $sh); 1756 $tex->draw_quad (0, 0, $w * 32, $h * 32);
780 1757
781 for my $x (0 .. $sw - 1) { 1758 glDisable GL_TEXTURE_2D;
782 for my $y (0 .. $sh - 1) { 1759 glDisable GL_BLEND;
783
784 my $cell = $map->[$x + $xofs][$y + $yofs]
785 or next;
786
787 my $darkness = $cell->[0] * (1 / 255);
788 if ($darkness < 0) {
789 $darkness = 0.15;
790 } 1760 }
791 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
792 1761
793 for my $num (grep $_, @$cell[1,2,3]) { 1762 # HACK BEGIN
794 my $tex = $::CONN->{face}[$num]{texture} || next; 1763 {
1764 my ($w, $h) = (250, 250);
795 1765
796 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1766 glEnable GL_BLEND;
1767 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
797 1770
798 my $w = $tex->{width}; 1771 CFClient::Texture->new (
799 my $h = $tex->{height}; 1772 w => $w,
1773 h => $h,
1774 data => $::MAP->mapmap ($w, $h),
1775 type => GL_UNSIGNED_INT_8_8_8_8_REV
1776 )->draw_quad (100, 100);
800 1777
801 my $px = ($x + 1) * 32 - $w; 1778 glDisable GL_TEXTURE_2D;
802 my $py = ($y + 1) * 32 - $h; 1779 glDisable GL_BLEND;
803
804 glBegin GL_QUADS;
805 glTexCoord 0, 0; glVertex $px , $py;
806 glTexCoord 0, 1; glVertex $px , $py + $h;
807 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
808 glTexCoord 1, 0; glVertex $px + $w, $py;
809 glEnd;
810 } 1780 }
1781 # HACK END
811 } 1782 }
812 }
813 1783
814# if (1) { # higher quality darkness 1784 glEndList;
815# $lighting =~ s/(.)/$1$1$1/gs;
816# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
817#
818# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
819#
820# $lighting = $pb->get_pixels;
821# $lighting =~ s/(.)../$1/gs;
822# } 1785 }
823 1786
824 $lighting = new Crossfire::Client::Texture 1787 glPushMatrix;
825 width => $sw4, 1788 glCallList $self->{list};
826 height => $sh, 1789 glPopMatrix;
827 data => $lighting,
828 internalformat => GL_ALPHA4,
829 format => GL_ALPHA;
830 1790
831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1791 if ($FOCUS != $self) {
832 glColor 0, 0, 0, 0.75; 1792 glColor 64/255, 64/255, 64/255;
833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1793 glLogicOp GL_AND;
834 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1794 glEnable GL_COLOR_LOGIC_OP;
835 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
836 glBegin GL_QUADS; 1795 glBegin GL_QUADS;
837 glTexCoord 0, 0; glVertex 0 , 0; 1796 glVertex 0, 0;
838 glTexCoord 0, 1; glVertex 0 , $sh * 32; 1797 glVertex 0, $::HEIGHT;
839 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; 1798 glVertex $::WIDTH, $::HEIGHT;
840 glTexCoord 1, 0; glVertex $sw4 * 32, 0; 1799 glVertex $::WIDTH, 0;
841 glEnd; 1800 glEnd;
842 1801 glDisable GL_COLOR_LOGIC_OP;
843 glDisable GL_TEXTURE_2D; 1802 }
844 glDisable GL_BLEND;
845} 1803}
846 1804
847my %DIR = ( 1805my %DIR = (
848 SDLK_KP8, [1, "north"], 1806 SDLK_KP8, [1, "north"],
849 SDLK_KP9, [2, "northeast"], 1807 SDLK_KP9, [2, "northeast"],
865 1823
866 my $mod = $ev->key_mod; 1824 my $mod = $ev->key_mod;
867 my $sym = $ev->key_sym; 1825 my $sym = $ev->key_sym;
868 1826
869 if ($sym == SDLK_KP5) { 1827 if ($sym == SDLK_KP5) {
870 $::CONN->send ("command stay fire"); 1828 $::CONN->user_send ("command stay fire");
1829 } elsif ($sym == SDLK_a) {
1830 $::CONN->user_send ("command apply");
1831 } elsif ($sym == SDLK_QUOTE) {
1832 $self->emit ('activate_console');
1833 } elsif ($sym == SDLK_SLASH) {
1834 $self->emit ('activate_console' => '/');
871 } elsif (exists $DIR{$sym}) { 1835 } elsif (exists $DIR{$sym}) {
872 if ($mod & KMOD_SHIFT) { 1836 if ($mod & KMOD_SHIFT) {
873 $self->{shft}++; 1837 $self->{shft}++;
874 $::CONN->send ("command fire $DIR{$sym}[0]"); 1838 $::CONN->user_send ("command fire $DIR{$sym}[0]");
875 } elsif ($mod & KMOD_CTRL) { 1839 } elsif ($mod & KMOD_CTRL) {
876 $self->{ctrl}++; 1840 $self->{ctrl}++;
877 $::CONN->send ("command run $DIR{$sym}[0]"); 1841 $::CONN->user_send ("command run $DIR{$sym}[0]");
878 } else { 1842 } else {
879 $::CONN->send ("command $DIR{$sym}[1]"); 1843 $::CONN->user_send ("command $DIR{$sym}[1]");
880 } 1844 }
881 } 1845 }
882} 1846}
883 1847
884sub key_up { 1848sub key_up {
886 1850
887 my $mod = $ev->key_mod; 1851 my $mod = $ev->key_mod;
888 my $sym = $ev->key_sym; 1852 my $sym = $ev->key_sym;
889 1853
890 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1854 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
891 $::CONN->send ("command fire_stop"); 1855 $::CONN->user_send ("command fire_stop");
892 } 1856 }
893 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1857 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
894 $::CONN->send ("command run_stop"); 1858 $::CONN->user_send ("command run_stop");
895 } 1859 }
896} 1860}
897 1861
898############################################################################# 1862#############################################################################
899 1863
900package Crossfire::Client::Widget::Animator; 1864package CFClient::UI::Animator;
901 1865
902use SDL::OpenGL; 1866use SDL::OpenGL;
903 1867
904our @ISA = Crossfire::Client::Widget::Bin::; 1868our @ISA = CFClient::UI::Bin::;
905 1869
906sub moveto { 1870sub moveto {
907 my ($self, $x, $y) = @_; 1871 my ($self, $x, $y) = @_;
908 1872
909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1873 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
910 $self->{speed} = 0.2; 1874 $self->{speed} = 0.001;
911 $self->{time} = 1; 1875 $self->{time} = 1;
912 1876
913 ::animation_start $self; 1877 ::animation_start $self;
914} 1878}
915 1879
930 1894
931sub _draw { 1895sub _draw {
932 my ($self) = @_; 1896 my ($self) = @_;
933 1897
934 glPushMatrix; 1898 glPushMatrix;
935 glRotate $self->{time} * 10000, 0, 1, 0; 1899 glRotate $self->{time} * 1000, 0, 1, 0;
936 $self->{children}[0]->draw; 1900 $self->{children}[0]->draw;
937 glPopMatrix; 1901 glPopMatrix;
938} 1902}
939 1903
9401; 1904#############################################################################
941 1905
1906package CFClient::UI::Flopper;
1907
1908our @ISA = CFClient::UI::Button::;
1909
1910sub new {
1911 my $class = shift;
1912
1913 my $self = $class->SUPER::new (
1914 state => 0,
1915 connect_activate => \&toggle_flopper,
1916 @_
1917 );
1918
1919 if ($self->{state}) {
1920 $self->{state} = 0;
1921 $self->toggle_flopper;
1922 }
1923
1924 $self
1925}
1926
1927sub toggle_flopper {
1928 my ($self) = @_;
1929
1930 # TODO: use animation
1931 if ($self->{state} = !$self->{state}) {
1932 $CFClient::UI::TOPLEVEL->add ($self->{other});
1933 $self->{other}->move (
1934 ($::WIDTH - $self->{other}{w}) * 0.5,
1935 ($::HEIGHT - $self->{other}{h}) * 0.5,
1936 );
1937 } else {
1938 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1939 }
1940}
1941
1942#############################################################################
1943
1944package CFClient::UI::Toplevel;
1945
1946our @ISA = CFClient::UI::Container::;
1947
1948use SDL::OpenGL;
1949
1950sub size_request {
1951 ($::WIDTH, $::HEIGHT)
1952}
1953
1954sub size_allocate {
1955 my ($self, $x, $y, $w, $h) = @_;
1956
1957 $self->_size_allocate ($x, $y, $w, $h);
1958
1959 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1960 for @{$self->{children}};
1961}
1962
1963sub translate {
1964 my ($self, $x, $y) = @_;
1965
1966 ($x, $y)
1967}
1968
1969sub update {
1970 my ($self) = @_;
1971
1972 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1973 ::refresh ();
1974}
1975
1976sub add {
1977 my ($self, $widget) = @_;
1978
1979 $self->SUPER::add ($widget);
1980
1981 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1982}
1983
1984sub on_refresh {
1985 my ($self, $id, $cb) = @_;
1986
1987 $self->{refresh_hook}{$id} = $cb;
1988}
1989
1990sub draw {
1991 my ($self) = @_;
1992
1993 while (my $rcb = delete $self->{refresh_hook}) {
1994 $_->() for values %$rcb;
1995 }
1996
1997 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1998 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1999 glClear GL_COLOR_BUFFER_BIT;
2000
2001 glMatrixMode GL_PROJECTION;
2002 glLoadIdentity;
2003 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2004 glMatrixMode GL_MODELVIEW;
2005 glLoadIdentity;
2006
2007 $self->_draw;
2008}
2009
2010#############################################################################
2011
2012package CFClient::UI;
2013
2014$TOPLEVEL = new CFClient::UI::Toplevel;
2015
20161
2017

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines